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