This reverts commit 0a6c74e2. This created a lot of post-commit failures due to buildbots running older versions of Python.