Switched to simple autoloading.