Get rid of 4.x-derived acpi code: