This reverts commit 809d9a8f. This one isn't quite ready for prime time. It needs more testing and additional feedback from the ACPI guys.