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