Eliminated first time connect delay

Rearranged timeout handling so that the first time connect delay is
eliminated.