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