Revert removal of multi-match discard heuristic in 27af01