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