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