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