Incompatible issue resolve

[shuishouqiaozhi]

Description

Intel server platform sync this commit will hit conflict since our code base is old. We don't want to cherry-pick the dependent patches to avoid potential issue. We need to revert this commit first and then fix the conflict and reapply the change. Sorry for the inconvenience.

• [ ] Breaking change?
  • Breaking change - Will this cause a break in build or boot behavior?
• [ ] Impacts security?
  • Security - Does the change have a direct security impact?
• [ ] Includes tests?
  • Tests - Does the change include any explicit test code?

How This Was Tested

EDK2 CI Checks

Integration Instructions

N/A

[leiflindholm]

Please add a proper PR description.

[leiflindholm]

@niruiyu why are we reverting merged code in the main project based on broken Intel-internal workflows?