Forgot to submit this earlier; it's needed to make test_threading pass.