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