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