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