diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f14471304b6..94dbba0ef1f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-06  Pedro Alves  <palves@redhat.com>
+
+	* infrun.c (handle_inferior_event) <deferred_step_ptid>: Use
+	context_switch and remove stale comment.
+
 2012-06-06  Pedro Alves  <palves@redhat.com>
 
 	* infrun.c (struct execution_control_state): Remove
diff --git a/gdb/infrun.c b/gdb/infrun.c
index b0085525c44..0017211bc44 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -3813,9 +3813,7 @@ handle_inferior_event (struct execution_control_state *ecs)
 
 	  ecs->event_thread->control.trap_expected = 0;
 
-	  /* Note: We do not call context_switch at this point, as the
-	     context is already set up for stepping the original thread.  */
-	  switch_to_thread (deferred_step_ptid);
+	  context_switch (deferred_step_ptid);
 	  deferred_step_ptid = null_ptid;
 	  /* Suppress spurious "Switching to ..." message.  */
 	  previous_inferior_ptid = inferior_ptid;