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