revert setup.py and requirements.txt from master