This reverts commit a170e26e27. Attempting to add more nuanced timeout logic.
a170e26e27
Closes coop-cloud/organising#205.