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