Pushing up, back to Python 2