Revert 00ca06b; closes #3414 #3715
+165
−72
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.