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