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