[PATCH 0/6] efi: Start to chip away at the EFI workaround