This should be no longer necessary with autoloading.