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