Is this change deliberate? It seems like it might make more sense to increase ``REMOTE_TIMEOUT``?