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