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