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