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