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