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