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