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