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