diff --git a/cli/flash.py b/cli/flash.py
index 5720943..4f2c488 100644
--- a/cli/flash.py
+++ b/cli/flash.py
@@ -232,10 +232,14 @@
           cmd, debug_level=logging.NOTICE,
           print_cmd=logging.getLogger().getEffectiveLevel() < logging.NOTICE)
 
-    # dd likely didn't put the backup GPT in the last block. cgpt can fix this
-    # up for us, so we have a standards-conforming GPT.
-    cros_build_lib.SudoRunCommand(['cgpt', 'repair', device],
+    # dd likely didn't put the backup GPT in the last block. sfdisk fixes this
+    # up for us with a 'write' command, so we have a standards-conforming GPT.
+    # Ignore errors because sfdisk (util-linux < v2.32) isn't always happy to
+    # fix GPT sanity issues.
+    cros_build_lib.SudoRunCommand(['sfdisk', device], input='write\n',
+                                  error_code_ok=True,
                                   debug_level=self.debug_level)
+
     cros_build_lib.SudoRunCommand(['sync'], debug_level=self.debug_level)
 
   def _GetImagePath(self):