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