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