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