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