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