Revert to previous autoload behavior