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