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