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