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