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