diff -r 2f92ad2dc5db -r d87ddb12c54a bsptemplate/asspandvariant/template_variant/bld.inf
--- a/bsptemplate/asspandvariant/template_variant/bld.inf	Wed Mar 31 23:38:45 2010 +0300
+++ b/bsptemplate/asspandvariant/template_variant/bld.inf	Fri Apr 02 11:01:24 2010 +0100
@@ -109,6 +109,7 @@
 
 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
@@ -130,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
 
@@ -149,4 +153,5 @@
 
 end
 
+#if 0  // second part of workaround - avoid dangling #endif
 #endif // !SBSV2