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