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