Backed out last change - removed python-virtualenv (it's in Part II)