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