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