diff --git a/lldb/tools/debugserver/source/MacOSX/MachProcess.mm b/lldb/tools/debugserver/source/MacOSX/MachProcess.mm
index 98cf95eded4d..62149dc71779 100644
--- a/lldb/tools/debugserver/source/MacOSX/MachProcess.mm
+++ b/lldb/tools/debugserver/source/MacOSX/MachProcess.mm
@@ -2000,9 +2000,7 @@ MachProcess::LaunchForDebug
                     break; // We tried a BKS launch, but didn't succeed lets get out
             }
         }
-        // In case the executable name has a ".app" fragment which confuses our debugserver,
-        // let's do an intentional fallthrough here...
-        launch_flavor = eLaunchFlavorPosixSpawn;
+        break;
 #endif
 #ifdef WITH_SPRINGBOARD
 
@@ -2032,9 +2030,7 @@ MachProcess::LaunchForDebug
                     break; // We tried a springboard launch, but didn't succeed lets get out
             }
         }
-        // In case the executable name has a ".app" fragment which confuses our debugserver,
-        // let's do an intentional fallthrough here...
-        launch_flavor = eLaunchFlavorPosixSpawn;
+        break;
 
 #endif
 
diff --git a/lldb/tools/debugserver/source/com.apple.debugserver.applist.plist b/lldb/tools/debugserver/source/com.apple.debugserver.applist.plist
index 4e847c20a718..bd4037cfada4 100644
--- a/lldb/tools/debugserver/source/com.apple.debugserver.applist.plist
+++ b/lldb/tools/debugserver/source/com.apple.debugserver.applist.plist
@@ -10,7 +10,8 @@
 	<array>
 		<string>/Developer/usr/bin/debugserver</string>
 		<string>--lockdown</string>
-		<string>--applist</string>
+        <string>--applist</string>
+        <string>--launch=backboard</string>
 	</array>
 </dict>
 </plist>
diff --git a/lldb/tools/debugserver/source/com.apple.debugserver.plist b/lldb/tools/debugserver/source/com.apple.debugserver.plist
index aa72606e0982..f61a2acdaa1f 100644
--- a/lldb/tools/debugserver/source/com.apple.debugserver.plist
+++ b/lldb/tools/debugserver/source/com.apple.debugserver.plist
@@ -10,6 +10,7 @@
 	<array>
 		<string>/Developer/usr/bin/debugserver</string>
 		<string>--lockdown</string>
+        <string>--launch=backboard</string>
 	</array>
 </dict>
 </plist>