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