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