Merge "Revert "Honors MATCH_ALL flag""