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