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