diff -r b3a1d9898418 -r aba5f24f35c1 bsptemplate/asspandvariant/template_variant/bld.inf
--- a/bsptemplate/asspandvariant/template_variant/bld.inf	Fri May 14 17:13:29 2010 +0300
+++ b/bsptemplate/asspandvariant/template_variant/bld.inf	Tue May 18 14:12:35 2010 +0100
@@ -109,10 +109,17 @@
 
 PRJ_EXTENSIONS
 
+#if 0 // Removing changes associated with introduction of bootstrap.flm - see Bug 2149
 #ifdef SBSV2 // If using SBSv2 with bootstrap FLM, MEMMODEL MUST begin with a capital letter
 
 start		extension		base.bootstrap bootstrap
 
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+option INC_PATH   $(EPOCROOT)epoc32/include
+#else
+option INC_PATH   $(EPOCROOT)epoc32/include/platform
+#endif
+
 option		NAME			_template_bootrom
 option		CPU				arm
 option		MEMMODEL		Multiple
@@ -124,6 +131,9 @@
 end
 
 #else // !SBSV2
+#endif // more workaround - close the #ifdef SBSV2 here, to regain the other bit
+#endif // first part of workaround - close the #ifdef 0
+
 
 start		extension		base/bootstrap bootstrap
 
@@ -143,4 +153,5 @@
 
 end
 
+#if 0  // second part of workaround - avoid dangling #endif
 #endif // !SBSV2