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