RF: revert setuptools attempted fix
RF: try upgrading virtualenv