Merge "Revert "Fix issue with creating virtualenv""