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