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