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