Remove irrelevant change for this patch

Undo the change that set the socket timeout earlier. Also undo test changes.