More tweaking requirements to make setup.py install work again.