Log Message: Apply the changes from setup2.py to setup3.py as well to fix the build of the Python 3.x variant.