Revert "clutch at more straws and see if waiting more before switching back helps"
This reverts commit 9fb252b0c1efb3941554680b64ebc2977116ba02.