Revert "Consolidate connect-scan status and errno checking".