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