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