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