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