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