[factory] pre-UEFI systems now require additional UEFI+ components???