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