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