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