diff --git a/MdePkg/Include/Ppi/MpServices2.h b/MdePkg/Include/Ppi/MpServices2.h
index 082d02fd40..b1e9c601cd 100644
--- a/MdePkg/Include/Ppi/MpServices2.h
+++ b/MdePkg/Include/Ppi/MpServices2.h
@@ -280,15 +280,13 @@ struct _EFI_PEI_MP_SERVICES2_PPI {
 
 extern EFI_GUID  gEfiPeiMpServices2PpiGuid;
 
-// For backwards compatability. To be removed.
-#ifdef ENABLE_DEPRECATED_EDKII_MP_SERVICES2
-
+//
+// The EDK II PEI MP Services 2 PPI has been replaced by the PEI MP Services 2
+// PPI in the MdePkg. The following definitions are only present for backwards
+// compatibility and will be removed in the future.
+//
 #define EDKII_PEI_MP_SERVICES2_PPI_GUID  EFI_PEI_MP_SERVICES2_PPI_GUID
 
 typedef EFI_PEI_MP_SERVICES2_PPI EDKII_PEI_MP_SERVICES2_PPI;
 
-#define gEdkiiPeiMpServices2PpiGuid  gEfiPeiMpServices2PpiGuid
-
-#endif
-
 #endif
diff --git a/MdePkg/MdePkg.ci.yaml b/MdePkg/MdePkg.ci.yaml
index cebccba59d..0fd39161e7 100644
--- a/MdePkg/MdePkg.ci.yaml
+++ b/MdePkg/MdePkg.ci.yaml
@@ -165,6 +165,7 @@
             "gEfiPeiMmAccessPpiGuid=gPeiSmmAccessPpiGuid",
             "gPeiSmmControlPpiGuid=gEfiPeiMmControlPpiGuid",
             "gEfiPeiMmCommunicationPpiGuid=gEfiPeiSmmCommunicationPpiGuid",
+            "gEdkiiPeiMpServices2PpiGuid=gEfiPeiMpServices2PpiGuid",
             ]
     },