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