diff --git a/lldb/include/lldb/Target/ThreadPlan.h b/lldb/include/lldb/Target/ThreadPlan.h
--- a/lldb/include/lldb/Target/ThreadPlan.h
+++ b/lldb/include/lldb/Target/ThreadPlan.h
@@ -360,8 +360,6 @@
 
   virtual bool ShouldStop(Event *event_ptr) = 0;
 
-  virtual bool ShouldAutoContinue(Event *event_ptr) { return false; }
-
   // Whether a "stop class" event should be reported to the "outside world".
   // In general if a thread plan is active, events should not be reported.
 
diff --git a/lldb/include/lldb/Target/ThreadPlanStepOverBreakpoint.h b/lldb/include/lldb/Target/ThreadPlanStepOverBreakpoint.h
--- a/lldb/include/lldb/Target/ThreadPlanStepOverBreakpoint.h
+++ b/lldb/include/lldb/Target/ThreadPlanStepOverBreakpoint.h
@@ -30,7 +30,6 @@
   bool MischiefManaged() override;
   void ThreadDestroyed() override;
   void SetAutoContinue(bool do_it);
-  bool ShouldAutoContinue(Event *event_ptr) override;
   bool IsPlanStale() override;
 
   lldb::addr_t GetBreakpointLoadAddress() const { return m_breakpoint_addr; }
diff --git a/lldb/source/Target/Thread.cpp b/lldb/source/Target/Thread.cpp
--- a/lldb/source/Target/Thread.cpp
+++ b/lldb/source/Target/Thread.cpp
@@ -861,10 +861,7 @@
   }
 
   if (!done_processing_current_plan) {
-    bool over_ride_stop = current_plan->ShouldAutoContinue(event_ptr);
-
-    LLDB_LOGF(log, "Plan %s explains stop, auto-continue %i.",
-              current_plan->GetName(), over_ride_stop);
+    LLDB_LOGF(log, "Plan %s explains stop.", current_plan->GetName());
 
     // We're starting from the base plan, so just let it decide;
     if (current_plan->IsBasePlan()) {
@@ -905,9 +902,6 @@
         }
       }
     }
-
-    if (over_ride_stop)
-      should_stop = false;
   }
 
   // One other potential problem is that we set up a master plan, then stop in
diff --git a/lldb/source/Target/ThreadPlanStepOverBreakpoint.cpp b/lldb/source/Target/ThreadPlanStepOverBreakpoint.cpp
--- a/lldb/source/Target/ThreadPlanStepOverBreakpoint.cpp
+++ b/lldb/source/Target/ThreadPlanStepOverBreakpoint.cpp
@@ -107,7 +107,7 @@
 }
 
 bool ThreadPlanStepOverBreakpoint::ShouldStop(Event *event_ptr) {
-  return !ShouldAutoContinue(event_ptr);
+  return !m_auto_continue;
 }
 
 bool ThreadPlanStepOverBreakpoint::StopOthers() { return true; }
@@ -173,10 +173,6 @@
   m_auto_continue = do_it;
 }
 
-bool ThreadPlanStepOverBreakpoint::ShouldAutoContinue(Event *event_ptr) {
-  return m_auto_continue;
-}
-
 bool ThreadPlanStepOverBreakpoint::IsPlanStale() {
   return GetThread().GetRegisterContext()->GetPC() != m_breakpoint_addr;
 }