Update setup.py

Reverting changes here, moved them to master.