Fixed import after the import-cleanup merge