Switch back to Python 3