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