diff --git a/git_cl.py b/git_cl.py
index edafad647..dda9cefbc 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -6286,13 +6286,7 @@ def _RunYapf(opts, paths, top_dir, upstream_commit):
         if not yapf_style:
             yapf_style = 'pep8'
 
-        with open(path, 'r') as py_f:
-            if 'python2' in py_f.readline():
-                vpython_script = 'vpython'
-            else:
-                vpython_script = 'vpython3'
-
-        cmd = [vpython_script, yapf_tool, '--style', yapf_style, path]
+        cmd = ['vpython3', yapf_tool, '--style', yapf_style, path]
 
         if not opts.full:
             ranges = line_diffs.get(path)
diff --git a/yapf b/yapf
index 40f272f5f..513548504 100755
--- a/yapf
+++ b/yapf
@@ -1,6 +1,7 @@
 #!/usr/bin/env vpython3
 
 # [VPYTHON:BEGIN]
+# python_version: "3.8"
 # wheel: <
 #   name: "infra/python/wheels/yapf-py3"
 #   version: "version:0.40.2"