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