diff --git a/lldb/source/Commands/CommandObjectPlatform.cpp b/lldb/source/Commands/CommandObjectPlatform.cpp
index 7487f8a..82de22a 100644
--- a/lldb/source/Commands/CommandObjectPlatform.cpp
+++ b/lldb/source/Commands/CommandObjectPlatform.cpp
@@ -426,11 +426,7 @@
                 Debugger &debugger = m_interpreter.GetDebugger();
 
                 if (argc == 0)
-                {
-                    const Args &target_settings_args = target->GetRunArguments();
-                    if (target_settings_args.GetArgumentCount())
-                        m_options.launch_info.GetArguments() = target_settings_args;
-                }
+                    target->GetRunArguments(m_options.launch_info.GetArguments());
 
                 ProcessSP process_sp (platform_sp->DebugProcess (m_options.launch_info, 
                                                                  debugger,