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