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