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