Fix perf issue for auto trait selection #95333
+31
−28
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.