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