This is the commit that BREAKS EVERYTHING.

And by "breaks everything," I mean I just figured out what David was
trying to tell me to do like two hours ago and fixed it. That's what's
in this commit. Yeah.