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