This should get test_timeout to pass when running on any python.org host. Will backport