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