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