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