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