Actually fix timeout issues.

Due to a misunderstanding of the python documentation, my last fix doesn't actually work, and the nature of the bug made it difficult to catch (I didn't have 3-4 hours to wait for the timeout). This should _actually_ fix it.