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