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