r7034: Revert change in util_sock.c from derrell until this is