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