This reverts commit 54458c52. The timeouts we were seeing have been fixed by 9a3f0cd7 and I think this was experiencing the same issue.