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