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