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