revert setup.py to master