Merge "Don't set address for failed remote connections"