diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bc8c37144f..18da2d92b0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2020-06-18  Pedro Alves  <palves@redhat.com>
+
+	* windows-nat.c (do_initial_windows_stuff): No longer set inferior_ptid.
+
 2020-06-18  Pedro Alves  <palves@redhat.com>
 
 	* go32-nat.c (go32_nat_target::create_inferior): Switch to thread
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index c3a4bdc0d4..19bc52bbbb 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -2019,12 +2019,6 @@ do_initial_windows_stuff (struct target_ops *ops, DWORD pid, int attaching)
   inferior_appeared (inf, pid);
   inf->attach_flag = attaching;
 
-  /* Make the new process the current inferior, so terminal handling
-     can rely on it.  When attaching, we don't know about any thread
-     id here, but that's OK --- nothing should be referencing the
-     current thread until we report an event out of windows_wait.  */
-  inferior_ptid = ptid_t (pid);
-
   target_terminal::init ();
   target_terminal::inferior ();