Revert "Add better match function."

This reverts commit a243fba8e0caa36e81d36a60dda187cd5f880be0.