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