revert match's changes to (finally) remove the bug where opening a folder causes...