Merge seemed to have lost one fix in _get_acpi_data