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