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