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