More work to keep same behavior for `python-virtualenv`