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