Revert "Revert "Revert "I think I'm done."""

This reverts commit 371c6279fe2e3297c24a893ece3044f51f363f52.