diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 79bef08f8a6..ab9edfe2c68 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -1827,7 +1827,6 @@ clear_pcb_flags(struct pcb *pcb, const u_int flags)
 }
 
 extern const char wrmsr_early_safe_gp_handler[];
-static struct region_descriptor wrmsr_early_safe_orig_efi_idt;
 
 void
 wrmsr_early_safe_start(void)
@@ -1836,7 +1835,6 @@ wrmsr_early_safe_start(void)
 	struct gate_descriptor *gpf_descr;
 	int i;
 
-	sidt(&wrmsr_early_safe_orig_efi_idt);
 	efi_idt.rd_limit = 32 * sizeof(idt0[0]);
 	efi_idt.rd_base = (uintptr_t)idt0;
 	lidt(&efi_idt);
@@ -1857,12 +1855,6 @@ wrmsr_early_safe_start(void)
 void
 wrmsr_early_safe_end(void)
 {
-	int i;
-
-	lidt(&wrmsr_early_safe_orig_efi_idt);
-
-	for (i = 0; i < 32; i++)
-		memset_early(&idt0[i], 0, sizeof(idt0[0]));
 }
 
 int