The Python3 change relanded yet again, so merge it yet again. This reverts commit f0019cdc. This reverts commit 854a7db4.