Fix match type instantiation when not approximating #17173
+134
−44
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.