Index: NVDataMgmt.c
===================================================================
diff -u -rafb0fcafdbfe0b57b79c330e37b504b8acc2b137 -r0d8af8f3b27be8190b1809f7b0d1fb1e59a315e6
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision afb0fcafdbfe0b57b79c330e37b504b8acc2b137)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 0d8af8f3b27be8190b1809f7b0d1fb1e59a315e6)
@@ -1206,7 +1206,6 @@
         memcpy( bufferAddress, nvDataStartPtr, bufferLength );
     }
 
-#ifndef SKIP_CAL_CHECK
     // Check if the non-volatile data is valid and if not raise the alarm
     if ( FALSE == isNVDataValid )
     {
@@ -1232,10 +1231,6 @@
         }
     }
 
-#else
-    isNVDataValid = TRUE;
-#endif
-
     return isNVDataValid;
 }