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