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