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