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