diff --git a/stand/i386/libi386/biosacpi.c b/stand/i386/libi386/biosacpi.c
index 236c3fc45e7b..3bda472f3fc6 100644
--- a/stand/i386/libi386/biosacpi.c
+++ b/stand/i386/libi386/biosacpi.c
@@ -63,36 +63,24 @@ biosacpi_detect(void)
     /*
      * Report the RSDP to the kernel. While this can be found with
      * a BIOS boot, the RSDP may be elsewhere when booted from UEFI.
-     * The old code used the 'hints' method to communite this to
-     * the kernel. However, while convenient, the 'hints' method
-     * is fragile and does not work when static hints are compiled
-     * into the kernel. Instead, move to setting different tunables
-     * that start with acpi. The old 'hints' can be removed before
-     * we branch for FreeBSD 12.
      */
     sprintf(buf, "0x%08x", VTOP(rsdp));
-    setenv("hint.acpi.0.rsdp", buf, 1);
     setenv("acpi.rsdp", buf, 1);
     revision = rsdp->Revision;
     if (revision == 0)
 	revision = 1;
     sprintf(buf, "%d", revision);
-    setenv("hint.acpi.0.revision", buf, 1);
     setenv("acpi.revision", buf, 1);
     strncpy(buf, rsdp->OemId, sizeof(rsdp->OemId));
     buf[sizeof(rsdp->OemId)] = '\0';
-    setenv("hint.acpi.0.oem", buf, 1);
     setenv("acpi.oem", buf, 1);
     sprintf(buf, "0x%08x", rsdp->RsdtPhysicalAddress);
-    setenv("hint.acpi.0.rsdt", buf, 1);
     setenv("acpi.rsdt", buf, 1);
     if (revision >= 2) {
 	/* XXX extended checksum? */
 	sprintf(buf, "0x%016llx", rsdp->XsdtPhysicalAddress);
-	setenv("hint.acpi.0.xsdt", buf, 1);
 	setenv("acpi.xsdt", buf, 1);
 	sprintf(buf, "%d", rsdp->Length);
-	setenv("hint.acpi.0.xsdt_length", buf, 1);
 	setenv("acpi.xsdt_length", buf, 1);
     }
 }