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