Add -w2 option back, to cope with hanging TCP connections