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