Revert "new upstream virtualenvwrapper"

This reverts commit d97b3b8ca1c598b2a7565dea13c0f8a31ffd3219.