diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 9a07e3fd72..5abd9b8aa2 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -232,11 +232,6 @@
   #  FALSE is for size reduction.
   gEfiMdeModulePkgTokenSpaceGuid.PcdSupportHiiImageProtocol|TRUE|BOOLEAN|0x00010100
   
-  ## If TRUE, these interface in EFI_HII_CONFIG_ROUTING_PROTOCOL will be supported: ExtractConfig, ExportConfig, RouteConfig 
-  # and GetAltCfg will be supported. Otherwise, these interfaces will return EFI_UNSUPPORTED.
-  # FALSE is for size reduction.
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSupportFullConfigRoutingProtocol|TRUE|BOOLEAN|0x00010101
-  
   ## If TRUE, USB KeyBoard Driver disables the default keyboard layout.
   #  The default keyboard layout serves as the backup when no keyboard layout can be retrieved
   #  from HII database.
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
index 4d533c496d..d55fdf4366 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
@@ -452,15 +452,6 @@ HiiConfigRoutingExtractConfig (
   EFI_STRING                          AccessResults;
   BOOLEAN                             FirstElement;
 
-  //
-  // For size reduction, please define PcdSupportFullConfigRoutingProtocol 
-  // as FALSE. But this renders the system to not 100% compliant with
-  // UEFI 2.1. Use this with caution.
-  //
-  if (!FeaturePcdGet (PcdSupportFullConfigRoutingProtocol)) {
-    return EFI_UNSUPPORTED;
-  }
-
   if (This == NULL || Progress == NULL || Results == NULL) {
     return EFI_INVALID_PARAMETER;
   }
@@ -660,15 +651,6 @@ HiiConfigRoutingExportConfig (
   UINTN                               NumberConfigAccessHandles;
   BOOLEAN                             FirstElement;
 
-  //
-  // For size reduction, please define PcdSupportFullConfigRoutingProtocol 
-  // as FALSE. But this renders the system to not 100% compliant with
-  // UEFI 2.1. Use this with caution.
-  //
-  if (!FeaturePcdGet (PcdSupportFullConfigRoutingProtocol)) {
-    return EFI_UNSUPPORTED;
-  }
-
   if (This == NULL || Results == NULL) {
     return EFI_INVALID_PARAMETER;
   }
@@ -784,15 +766,6 @@ HiiConfigRoutingRouteConfig (
   EFI_HII_CONFIG_ACCESS_PROTOCOL      *ConfigAccess;
   EFI_STRING                          AccessProgress;
 
-  //
-  // For size reduction, please define PcdSupportFullConfigRoutingProtocol 
-  // as FALSE. But this renders the system to not 100% compliant with
-  // UEFI 2.1. Use this with caution.
-  //
-  if (!FeaturePcdGet (PcdSupportFullConfigRoutingProtocol)) {
-    return EFI_UNSUPPORTED;
-  }
-
   if (This == NULL || Progress == NULL) {
     return EFI_INVALID_PARAMETER;
   }
@@ -1490,15 +1463,6 @@ HiiGetAltCfg (
   BOOLEAN                             NameFlag;
   BOOLEAN                             PathFlag;
 
-  //
-  // For size reduction, please define PcdSupportFullConfigRoutingProtocol 
-  // as FALSE. But this renders the system to not 100% compliant with
-  // UEFI 2.1. Use this with caution.
-  //
-  if (!FeaturePcdGet (PcdSupportFullConfigRoutingProtocol)) {
-    return EFI_UNSUPPORTED;
-  }
-
   HdrStart = NULL;
   HdrEnd   = NULL;
   GuidStr  = NULL;
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
index 5007c58375..ae584cca1b 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
@@ -62,14 +62,13 @@
   gEfiDevicePathProtocolGuid                                            ## SOMETIMES_CONSUMES
   gEfiHiiStringProtocolGuid                                             ## PRODUCES
   gEfiHiiImageProtocolGuid |PcdSupportHiiImageProtocol                  ## PRODUCES
-  gEfiHiiConfigRoutingProtocolGuid |PcdSupportFullConfigRoutingProtocol ## PRODUCES
+  gEfiHiiConfigRoutingProtocolGuid                                      ## PRODUCES
   gEfiHiiDatabaseProtocolGuid                                           ## PRODUCES
   gEfiHiiFontProtocolGuid                                               ## PRODUCES
   gEfiHiiConfigAccessProtocolGuid                                       ## CONSUMES
 
 [FeaturePcd.common]
   gEfiMdeModulePkgTokenSpaceGuid.PcdSupportHiiImageProtocol
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSupportFullConfigRoutingProtocol
 
 [Pcd.common]
   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang