diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 208157fc6f..1116b12cb1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -7,9 +7,7 @@
 	continuations and intermediate_continuations.
 	(save_infrun_state, load_infrun_state): Delete continuations and
 	intermediate_continuations arguments.
-	* infrun.c (fetch_inferior_event): Only call normal_stop if
-	stop_soon is NO_STOP_QUIETLY.
-	(context_switch): Don't context-switch the continuations.
+	* infrun.c (context_switch): Don't context-switch the continuations.
 	* thread.c (clear_thread_inferior_resources): Discard all
 	continuations of the thread we're clearing.
 	(save_infrun_state, load_infrun_state): Delete continuations and
diff --git a/gdb/infrun.c b/gdb/infrun.c
index fbbc17a161..09afaa88c0 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -1742,12 +1742,10 @@ context_switch (ptid_t ptid)
   if (in_thread_list (inferior_ptid) && in_thread_list (ptid))
     {				/* Perform infrun state context switch: */
       /* Save infrun state for the old thread.  */
-      save_infrun_state (inferior_ptid,
-			 cmd_continuation, intermediate_continuation);
+      save_infrun_state (inferior_ptid);
 
       /* Load infrun state for the new thread.  */
-      load_infrun_state (ptid,
-			 &cmd_continuation, &intermediate_continuation);
+      load_infrun_state (ptid);
     }
 
   switch_to_thread (ptid);