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