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