Merge pull request #1090 from TheBlueMatt/2021-09-absurd-timeouts