Merge "Revert edk2 workaround"