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