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