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