Revert "Revert "Revert "What did I do?"""

This reverts commit fb0923ca9fd33f4456bc9409a38ad3b4dcef3834.