diff --git a/recipes/devicelab/devicelab_drone.expected/basic.json b/recipes/devicelab/devicelab_drone.expected/basic.json
index 584d8c1..449402b 100644
--- a/recipes/devicelab/devicelab_drone.expected/basic.json
+++ b/recipes/devicelab/devicelab_drone.expected/basic.json
@@ -205,7 +205,6 @@
         "[CLEANUP]/tmp_tmp_2/vpython"
       ]
     },
-    "infra_step": true,
     "name": "flutter doctor"
   },
   {
diff --git a/recipes/devicelab/devicelab_drone.expected/post-submit.json b/recipes/devicelab/devicelab_drone.expected/post-submit.json
index 840c08b..d31c960 100644
--- a/recipes/devicelab/devicelab_drone.expected/post-submit.json
+++ b/recipes/devicelab/devicelab_drone.expected/post-submit.json
@@ -206,7 +206,6 @@
         "[CLEANUP]/tmp_tmp_2/vpython"
       ]
     },
-    "infra_step": true,
     "name": "flutter doctor"
   },
   {
diff --git a/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json b/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
index b12638a..3b4a1ae 100644
--- a/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
+++ b/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
@@ -206,7 +206,6 @@
         "[CLEANUP]/tmp_tmp_2/vpython"
       ]
     },
-    "infra_step": true,
     "name": "flutter doctor"
   },
   {
diff --git a/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json b/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json
index 9874923..c78ec15 100644
--- a/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json
+++ b/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json
@@ -206,7 +206,6 @@
         "[CLEANUP]/tmp_tmp_2/vpython"
       ]
     },
-    "infra_step": true,
     "name": "flutter doctor"
   },
   {
diff --git a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
index 9874923..c78ec15 100644
--- a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
+++ b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
@@ -206,7 +206,6 @@
         "[CLEANUP]/tmp_tmp_2/vpython"
       ]
     },
-    "infra_step": true,
     "name": "flutter doctor"
   },
   {
diff --git a/recipes/devicelab/devicelab_drone.py b/recipes/devicelab/devicelab_drone.py
index e37e628..c6bfb51 100644
--- a/recipes/devicelab/devicelab_drone.py
+++ b/recipes/devicelab/devicelab_drone.py
@@ -58,7 +58,10 @@
     # git_branch is set only when the build was triggered by buildbucket.
     runner_params.extend(['--git-branch', git_branch])
   with api.context(env=env, env_prefixes=env_prefixes, cwd=devicelab_path):
-    api.step('flutter doctor', ['flutter', 'doctor'], infra_step=True)
+    api.step(
+        'flutter doctor',
+        ['flutter', 'doctor'],
+    )
     api.step('pub get', ['pub', 'get'], infra_step=True)
     dep_list = {d['dependency']: d.get('version') for d in deps}
     if dep_list.has_key('xcode'):
diff --git a/recipes/flutter/flutter.expected/validators.json b/recipes/flutter/flutter.expected/validators.json
index eeff51e..7f21f2c 100644
--- a/recipes/flutter/flutter.expected/validators.json
+++ b/recipes/flutter/flutter.expected/validators.json
@@ -158,7 +158,6 @@
         "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin"
       ]
     },
-    "infra_step": true,
     "name": "prepare environment.flutter doctor",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/flutter/flutter.py b/recipes/flutter/flutter.py
index 19af793..c0e4afe 100644
--- a/recipes/flutter/flutter.py
+++ b/recipes/flutter/flutter.py
@@ -66,7 +66,10 @@
   )
   with api.context(env=env, env_prefixes=env_prefixes, cwd=checkout_path):
     with api.step.nest('prepare environment'), api.step.defer_results():
-      api.step('flutter doctor', ['flutter', 'doctor'], infra_step=True)
+      api.step(
+          'flutter doctor',
+          ['flutter', 'doctor'],
+      )
       api.step(
           'download dependencies',
           ['flutter', 'update-packages'],
diff --git a/recipes/flutter/flutter_drone.expected/android_sdk.json b/recipes/flutter/flutter_drone.expected/android_sdk.json
index dc7f520..d8b4039 100644
--- a/recipes/flutter/flutter_drone.expected/android_sdk.json
+++ b/recipes/flutter/flutter_drone.expected/android_sdk.json
@@ -362,7 +362,6 @@
         "[CACHE]/android/tools"
       ]
     },
-    "infra_step": true,
     "name": "flutter doctor"
   },
   {
diff --git a/recipes/flutter/flutter_drone.expected/no_requirements.json b/recipes/flutter/flutter_drone.expected/no_requirements.json
index 99d0518..e6dc9b1 100644
--- a/recipes/flutter/flutter_drone.expected/no_requirements.json
+++ b/recipes/flutter/flutter_drone.expected/no_requirements.json
@@ -172,7 +172,6 @@
         "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
       ]
     },
-    "infra_step": true,
     "name": "flutter doctor"
   },
   {
diff --git a/recipes/flutter/flutter_drone.expected/web_engine.json b/recipes/flutter/flutter_drone.expected/web_engine.json
index 5cbaf2d..59d7647 100644
--- a/recipes/flutter/flutter_drone.expected/web_engine.json
+++ b/recipes/flutter/flutter_drone.expected/web_engine.json
@@ -293,7 +293,6 @@
         "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
       ]
     },
-    "infra_step": true,
     "name": "flutter doctor"
   },
   {
diff --git a/recipes/flutter/flutter_drone.expected/xcode.json b/recipes/flutter/flutter_drone.expected/xcode.json
index 99d0518..e6dc9b1 100644
--- a/recipes/flutter/flutter_drone.expected/xcode.json
+++ b/recipes/flutter/flutter_drone.expected/xcode.json
@@ -172,7 +172,6 @@
         "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
       ]
     },
-    "infra_step": true,
     "name": "flutter doctor"
   },
   {
diff --git a/recipes/flutter/flutter_drone.py b/recipes/flutter/flutter_drone.py
index dae3cc2..92782e6 100644
--- a/recipes/flutter/flutter_drone.py
+++ b/recipes/flutter/flutter_drone.py
@@ -76,7 +76,6 @@
         api.step(
             'flutter doctor',
             ['flutter', 'doctor', '-v'],
-            infra_step=True,
         )
         RunShard(api, env, env_prefixes, checkout_path)
         # This is to clean up leaked processes.
@@ -88,7 +87,6 @@
         api.step(
             'flutter doctor',
             ['flutter', 'doctor', '-v'],
-            infra_step=True,
         )
         RunShard(api, env, env_prefixes, checkout_path)
         # This is to clean up leaked processes.