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