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