--- a/bsptemplate/asspandvariant/template_variant/bld.inf	Mon Mar 08 11:57:08 2010 +0000
+++ b/bsptemplate/asspandvariant/template_variant/bld.inf	Sun Mar 14 13:15:32 2010 +0000
@@ -108,12 +108,39 @@
 //
 
 PRJ_EXTENSIONS
-start		extension		base/bootstrap
+
+#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   /epoc32/include
+option INC_PATH   $(EPOCROOT)epoc32/include
 #else
-option INC_PATH  /epoc32/include/platform
+option INC_PATH   $(EPOCROOT)epoc32/include/platform
+#endif
+
+option		NAME			_template_bootrom
+option		CPU				arm
+option		MEMMODEL		Multiple
+option		SOURCES			./bootstrap/template.s
+option		EXTRA_SRC_PATH	./bootstrap
+option		INCLUDES		./config.inc
+option		E32PATH			../../../kernel/eka/../.
+
+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
+
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+option INC_PATH   $(EPOCROOT)epoc32/include
+#else
+option INC_PATH  $(EPOCROOT)epoc32/include/platform
 #endif
 
 option		NAME			_template_bootrom
@@ -126,3 +153,5 @@
 
 end
 
+#if 0  // second part of workaround - avoid dangling #endif
+#endif // !SBSV2