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