Index: RTC.c
===================================================================
diff -u -r886d511b0955f3886fa1f4669182348af5e94361 -r11a039b03cef89e3589f738f9505232f96397820
--- RTC.c	(.../RTC.c)	(revision 886d511b0955f3886fa1f4669182348af5e94361)
+++ RTC.c	(.../RTC.c)	(revision 11a039b03cef89e3589f738f9505232f96397820)
@@ -119,7 +119,6 @@
 #define YEAR_2000                           2000U                       ///< Year 2000
 #define EPOCH_BASE_YEAR                     1970U                       ///< Reference year to calculate epoch (1970)
 #define YEAR_2021                           2021U                       ///< Year 2021
-#define RTC_CHECK_YEAR_TIMEOUT_MS           ( 3 * MS_PER_SECOND )       ///< RTC check year timeout in milliseconds.
 
 #define SECS_IN_HOUR                        3600                        ///< Number of seconds in an hour.
 #define MONTHS_IN_YEAR                      12                          ///< Number of months in a year.
@@ -1466,7 +1465,6 @@
         S32 elapsedTime     = (S32)calcTimeSince( RTCSelfTestTimer );
         S32 deltaTime       = elapsedTime - (S32)MS_PER_SECOND;
         S32 elapsedFPGATime = (S32)u16DiffWithWrap( previousFPGATimerCount, getFPGATimerCount() );
-        RTCSelfTestTimer    = getMSTimerCount();
         result              = RTC_SELF_TEST_STATE_CHECK_RTC_YEAR;
 
 #ifdef _DG_
@@ -1532,13 +1530,6 @@
 
         state = RTC_SELF_TEST_STATE_COMPLETE;
     }
-    else if ( TRUE == didTimeout( RTCSelfTestTimer, RTC_CHECK_YEAR_TIMEOUT_MS ) )
-    {
-        // If the year is still 0 after a certain period of time, alarm
-        RTCSelfTestResult = SELF_TEST_STATUS_FAILED;
-        state             = RTC_SELF_TEST_STATE_COMPLETE;
-        SET_ALARM_WITH_1_U32_DATA( alarm, (U16)RTCTimestampStruct.years );
-    }
 
     return state;
 }