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