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