We should be able to remove this now; I just resolved PYTHON-33/39.