This reverts commit a170e26e27b373a73616bc4671c8c074644031a0. Attempting to add more nuanced timeout logic.