Another patch to handle dns timeouts better