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