diff -r c1f20ce4abcf -r 3e88ff8f41d5 bsptemplate/asspandvariant/template_variant/specific/variant.cpp
--- a/bsptemplate/asspandvariant/template_variant/specific/variant.cpp	Tue Aug 31 16:34:26 2010 +0300
+++ b/bsptemplate/asspandvariant/template_variant/specific/variant.cpp	Wed Sep 01 12:34:56 2010 +0100
@@ -27,12 +27,8 @@
 const TUint KHtCustomRestartMask  = KHtCustomRestartMax << KHtCustomRestartShift; 
 
 const TUint KHtRestartStartupModesMax = 0xf; // Variable, platform dependant 
-
-#undef USE_MODE_SHIFT_MASK
-#ifdef USE_MODE_SHIFT_MASK
 const TUint KHtRestartStartupModesShift = 16; // Variable, platform dependant 
 const TUint KHtRestartStartupModesMask = KHtRestartStartupModesMax << KHtRestartStartupModesShift;
-#endif
 
 void TemplateVariantFault(TInt aLine)
 	{
@@ -434,11 +430,8 @@
 			// TO DO: (optional)
 			//
 			// Read the restart startup mode, e.g:
-#undef USE_MODE_SHIFT_MASK
-#ifdef USE_MODE_SHIFT_MASK
-			TInt startup = (Kern::SuperPage().iHwStartupReason & KHtRestartStartupModesMask) >> KHtRestartStartupModesShift;
-			kumemput32(a1, &startup, sizeof(TInt));
-#endif
+			// TInt startup = (Kern::SuperPage().iHwStartupReason & KHtRestartStartupModesMask) >> KHtRestartStartupModesShift;
+			// kumemput32(a1, &startup, sizeof(TInt));
 			break; 			
 			}