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