These lines shouldn't be re-added, you can probably pull from 1.x or just remove. They've been moved to contact_autoload_info() in #231.