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