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