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