diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a191b6232d..dbd222d776 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-25  Pedro Alves  <palves@redhat.com>
+
+	* infrun.c (user_visible_resume_ptid): Don't check
+	singlestep_breakpoints_inserted_p.
+
 2014-09-25  Pedro Alves  <palves@redhat.com>
 
 	* breakpoint.c (should_be_inserted): Add debug output.
diff --git a/gdb/infrun.c b/gdb/infrun.c
index dc696e9264..5e123be0e0 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -1739,8 +1739,7 @@ user_visible_resume_ptid (int step)
       resume_ptid = inferior_ptid;
     }
   else if ((scheduler_mode == schedlock_on)
-	   || (scheduler_mode == schedlock_step
-	       && (step || singlestep_breakpoints_inserted_p)))
+	   || (scheduler_mode == schedlock_step && step))
     {
       /* User-settable 'scheduler' mode requires solo thread resume.  */
       resume_ptid = inferior_ptid;