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