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