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