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