Fix c23f25545f5 for Python 2.