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