Get around timeouts on client that cause teardown to fail