merged
mentioned in commit 895fb0d4
This will create a new commit in order to revert the existing changes.
