Make more use of env. Pythons

(cherry picked from commit bb06d92010d1c633b4face5031142437716c80e2)