Adjust timeouts
Revert 0308f871