diff --git a/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcRtc.c b/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcRtc.c
index 42f0c1a9ae..e9367fb737 100644
--- a/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcRtc.c
+++ b/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcRtc.c
@@ -199,8 +199,8 @@ PcRtcInit (
   //
   DataSize = sizeof (UINT32);
   Status = EfiGetVariable (
-             L"TimerVar",
-             &gEfiGenericPlatformVariableGuid,
+             L"RTC",
+             &gEfiCallerIdGuid,
              NULL,
              &DataSize,
              (VOID *) &TimerVar
@@ -429,8 +429,8 @@ PcRtcSetTime (
   TimerVar = Time->Daylight;
   TimerVar = (UINT32) ((TimerVar << 16) | Time->TimeZone);
   Status =  EfiSetVariable (
-              L"TimerVar",
-              &gEfiGenericPlatformVariableGuid,
+              L"RTC",
+              &gEfiCallerIdGuid,
               EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,
               sizeof (TimerVar),
               &TimerVar
diff --git a/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcRtc.h b/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcRtc.h
index 7b6c1c1002..5beb075691 100644
--- a/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcRtc.h
+++ b/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcRtc.h
@@ -20,7 +20,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Uefi.h>
 
 #include <Protocol/RealTimeClock.h>
-#include <Guid/GenericPlatformVariable.h>
 
 #include <Library/BaseLib.h>
 #include <Library/DebugLib.h>
diff --git a/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf b/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
index 4f28e13e10..e9cdf48fd6 100644
--- a/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
+++ b/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
@@ -52,10 +52,6 @@
   BaseLib
   PcdLib
 
-[Guids]
-  gEfiGenericPlatformVariableGuid               ## PRODUCES ##Variable:L"TimerVar"
-  gEfiGenericPlatformVariableGuid               ## CONSUMES ##Variable:L"TimerVar"
-
 [Protocols]
   gEfiRealTimeClockArchProtocolGuid             ## PRODUCES