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