This is one of those places that needs a bunch of cleanup, but we don't have to do that now.