diff --git a/lldb/source/Target/RemoteAwarePlatform.cpp b/lldb/source/Target/RemoteAwarePlatform.cpp
--- a/lldb/source/Target/RemoteAwarePlatform.cpp
+++ b/lldb/source/Target/RemoteAwarePlatform.cpp
@@ -32,62 +32,43 @@
 Status RemoteAwarePlatform::ResolveExecutable(
     const ModuleSpec &module_spec, ModuleSP &exe_module_sp,
     const FileSpecList *module_search_paths_ptr) {
-  Status error;
-  // Nothing special to do here, just use the actual file and architecture
 
-  char exe_path[PATH_MAX];
   ModuleSpec resolved_module_spec(module_spec);
 
-  if (IsHost()) {
-    // If we have "ls" as the exe_file, resolve the executable location based
-    // on the current path variables
-    if (!FileSystem::Instance().Exists(resolved_module_spec.GetFileSpec())) {
-      resolved_module_spec.GetFileSpec().GetPath(exe_path, sizeof(exe_path));
-      resolved_module_spec.GetFileSpec().SetFile(exe_path,
-                                                 FileSpec::Style::native);
-      FileSystem::Instance().Resolve(resolved_module_spec.GetFileSpec());
-    }
-
-    if (!FileSystem::Instance().Exists(resolved_module_spec.GetFileSpec()))
-      FileSystem::Instance().ResolveExecutableLocation(
-          resolved_module_spec.GetFileSpec());
+  if (IsRemote())
+    return GetCachedExecutable(resolved_module_spec, exe_module_sp,
+                               module_search_paths_ptr);
 
-    // Resolve any executable within a bundle on MacOSX
-    Host::ResolveExecutableInBundle(resolved_module_spec.GetFileSpec());
 
-    if (FileSystem::Instance().Exists(resolved_module_spec.GetFileSpec()))
-      error.Clear();
-    else {
-      const uint32_t permissions = FileSystem::Instance().GetPermissions(
-          resolved_module_spec.GetFileSpec());
-      if (permissions && (permissions & eFilePermissionsEveryoneR) == 0)
-        error.SetErrorStringWithFormat(
-            "executable '%s' is not readable",
-            resolved_module_spec.GetFileSpec().GetPath().c_str());
-      else
-        error.SetErrorStringWithFormat(
-            "unable to find executable for '%s'",
-            resolved_module_spec.GetFileSpec().GetPath().c_str());
-    }
-  } else {
-    if (m_remote_platform_sp) {
-      return GetCachedExecutable(resolved_module_spec, exe_module_sp,
-                                 module_search_paths_ptr);
-    }
+  // If we have "ls" as the exe_file, resolve the executable location based
+  // on the current path variables
+  if (!FileSystem::Instance().Exists(resolved_module_spec.GetFileSpec())) {
+    char exe_path[PATH_MAX];
+    resolved_module_spec.GetFileSpec().GetPath(exe_path, sizeof(exe_path));
+    resolved_module_spec.GetFileSpec().SetFile(exe_path,
+                                               FileSpec::Style::native);
+    FileSystem::Instance().Resolve(resolved_module_spec.GetFileSpec());
+  }
 
-    // We may connect to a process and use the provided executable (Don't use
-    // local $PATH).
+  if (!FileSystem::Instance().Exists(resolved_module_spec.GetFileSpec()))
+    FileSystem::Instance().ResolveExecutableLocation(
+        resolved_module_spec.GetFileSpec());
 
-    // Resolve any executable within a bundle on MacOSX
-    Host::ResolveExecutableInBundle(resolved_module_spec.GetFileSpec());
+  // Resolve any executable within a bundle on MacOSX
+  Host::ResolveExecutableInBundle(resolved_module_spec.GetFileSpec());
 
-    if (FileSystem::Instance().Exists(resolved_module_spec.GetFileSpec()))
-      error.Clear();
+  Status error;
+  if (!FileSystem::Instance().Exists(resolved_module_spec.GetFileSpec())) {
+    const uint32_t permissions = FileSystem::Instance().GetPermissions(
+        resolved_module_spec.GetFileSpec());
+    if (permissions && (permissions & eFilePermissionsEveryoneR) == 0)
+      error.SetErrorStringWithFormat(
+          "executable '%s' is not readable",
+          resolved_module_spec.GetFileSpec().GetPath().c_str());
     else
-      error.SetErrorStringWithFormat("the platform is not currently "
-                                     "connected, and '%s' doesn't exist in "
-                                     "the system root.",
-                                     exe_path);
+      error.SetErrorStringWithFormat(
+          "unable to find executable for '%s'",
+          resolved_module_spec.GetFileSpec().GetPath().c_str());
   }
 
   if (error.Success()) {