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