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