Untested commit: Do not connect to S3 on import