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