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