Add compatibility with Py2 back.