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