Were we relying on autoload for these before or something?