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