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