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