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