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