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