diff --git a/lldb/source/Target/Thread.cpp b/lldb/source/Target/Thread.cpp
index 40c137c..26502f2 100644
--- a/lldb/source/Target/Thread.cpp
+++ b/lldb/source/Target/Thread.cpp
@@ -1626,6 +1626,7 @@
                                               uint32_t frame_idx,
                                               bool continue_to_next_branch)
 {
+    const bool calculate_return_value = false; // No need to calculate the return value here.
     ThreadPlanSP thread_plan_sp(new ThreadPlanStepOut (*this,
                                                         addr_context, 
                                                         first_insn, 
@@ -1634,7 +1635,8 @@
                                                         run_vote, 
                                                         frame_idx,
                                                         eLazyBoolNo,
-                                                        continue_to_next_branch));
+                                                        continue_to_next_branch,
+                                                        calculate_return_value));
 
     ThreadPlanStepOut *new_plan = static_cast<ThreadPlanStepOut *>(thread_plan_sp.get());
     new_plan->ClearShouldStopHereCallbacks();