[Merged by Bors] - Cleanup some things which shouldn't be components #2982
+47
−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.