diff --git a/engine/src/flutter/tools/skydb b/engine/src/flutter/tools/skydb
index 4c22df7252..b7a4aa907f 100755
--- a/engine/src/flutter/tools/skydb
+++ b/engine/src/flutter/tools/skydb
@@ -118,7 +118,11 @@ class SkyDebugger(object):
             remote_server_port,
             self.pids['sky_server_root'],
             self.pids['build_dir'])
-        shell_args += ['--origin=%s' % build_dir_url]
+
+        # TODO(eseidel): We should do this on linux, but we need to fix
+        # mojo http loading to be faster first.
+        if is_android:
+            shell_args += ['--origin=%s' % build_dir_url]
 
         # Desktop-only work-around for mojo crashing under chromoting.
         if not is_android and args.use_osmesa:
@@ -194,6 +198,8 @@ class SkyDebugger(object):
         self.pids['sky_command_port'] = args.command_port
 
         if is_android:
+            # TODO(eseidel): This should move into a helper method and handle
+            # failures with nice messages explaining how to get root.
             subprocess.check_call([ADB_PATH, 'root'])
 
             # We could make installing conditional on an argument.