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