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