Restored python 2.x compat.