Backport "Revert #17623" to LTS #18963
+97
−131
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.