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