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