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