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