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