diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
--- a/sys/amd64/amd64/fpu.c
+++ b/sys/amd64/amd64/fpu.c
@@ -1148,12 +1148,6 @@
 			    ("invalid fpcurthread"));
 		}
 
-		/*
-		 * This breaks XSAVEOPT tracker, but
-		 * PCB_FPUNOSAVE state is supposed to never need to
-		 * save FPU context at all.
-		 */
-		fpurestore(fpu_initialstate);
 		set_pcb_flags(pcb, PCB_KERNFPU | PCB_FPUNOSAVE |
 		    PCB_FPUINITDONE);
 		return;