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