Fix #7650: Drop stale toplevel definitions #7652
+193
−79
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.