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