Fix pip issue broken in recent change

The recent setuptools change had the desired effect, save for breaking pip. This pull request should re-add it.