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