diff --git a/src/TulsiGenerator/PBXTargetGenerator.swift b/src/TulsiGenerator/PBXTargetGenerator.swift
index 8ded5cb..3c1e55d 100644
--- a/src/TulsiGenerator/PBXTargetGenerator.swift
+++ b/src/TulsiGenerator/PBXTargetGenerator.swift
@@ -1530,6 +1530,10 @@
     let dSYMEnabled = entry.attributes[.has_swift_dependency] as? Bool ?? false
     buildSettings["TULSI_MUST_USE_DSYM"] = dSYMEnabled ? "YES" : "NO"
 
+    // Present an option to bypass the build script's check for Spotlight. Turning off Spotlight is
+    // not recommended as it leads to a severely poor debugging experience.
+    buildSettings["TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK"] = "NO"
+
     // Disable Xcode's attempts at generating dSYM bundles as it conflicts with the operation of the
     // special test runner build configurations (which have associated sources but don't actually
     // compile anything).
diff --git a/src/TulsiGenerator/Scripts/bazel_build.py b/src/TulsiGenerator/Scripts/bazel_build.py
index e806873..cf93455 100755
--- a/src/TulsiGenerator/Scripts/bazel_build.py
+++ b/src/TulsiGenerator/Scripts/bazel_build.py
@@ -486,6 +486,8 @@
 
   BUILD_EVENTS_FILE = 'build_events.json'
 
+  SPOTLIGHT_CHECK_ENVVAR = 'TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK'
+
   def __init__(self):
     self.verbose = 0
     self.build_path = None
@@ -500,6 +502,9 @@
     if not self.xcode_action:
       self.xcode_action = 'build'
 
+    self.build_without_spotlight = os.environ.get(
+        BazelBuildBridge.SPOTLIGHT_CHECK_ENVVAR, 'NO') == 'YES'
+
     self.generate_dsym = (os.environ.get('TULSI_ALL_DSYM', 'NO') == 'YES' or
                           os.environ.get('TULSI_MUST_USE_DSYM', 'NO') == 'YES')
     self.use_debug_prefix_map = os.environ.get('TULSI_DEBUG_PREFIX_MAP',
@@ -597,6 +602,11 @@
       sys.stderr.write('Xcode action is %s, ignoring.' % self.xcode_action)
       return 0
 
+    if not self.build_without_spotlight:
+      spotlight_status = self._CheckSpotlightStatus()
+      if spotlight_status:
+        return spotlight_status
+
     parser = _OptionsParser(self.sdk_version,
                             self.platform_name,
                             self.arch,
@@ -1806,6 +1816,53 @@
           'Linking Tulsi Workspace to %s failed.' % tulsi_workspace)
       return -1
 
+  def _PrintSpotlightDisabledMessaging(self):
+    """Prints errors to the console indicating that Spotlight is required."""
+    spotlight_required_msg = ('Spotlight is needed to find debugging info '
+                              'for Bazel-built sources.')
+    spotlight_enable_msg = ('Please enable Spotlight with `sudo mdutil -i on /`'
+                            ' in the Terminal.')
+    spotlight_check_disable_msg = ('If you need to disable this check and '
+                                   'proceed with a compromised debugging '
+                                   'experience set %s to YES.' %
+                                   BazelBuildBridge.SPOTLIGHT_CHECK_ENVVAR)
+    _PrintXcodeError(spotlight_required_msg)
+    _PrintXcodeError(spotlight_enable_msg)
+    _PrintXcodeWarning(spotlight_check_disable_msg)
+
+  def _CheckSpotlightStatus(self):
+    """Check if Spotlight has been enabled on root, error if it hasn't been.
+
+    Returns:
+      Int: 0 if Spotlight reports that indexing is enabled on the root dir.
+           -1 if Spotlight indexing was not found to be enabled on the root
+           dir. The return code if the mdutil query on the root dir failed
+           to execute properly.
+    """
+    sys.stdout.write('Checking Spotlight status on the startup disk.\n')
+    sys.stdout.flush()
+    returncode, output = self._RunSubprocess([
+        'mdutil',
+        '-s',
+        '/'
+    ])
+    sys.stdout.flush()
+    output_single_line = output.replace('\n', '').replace('\t', ' ')
+    if returncode != 0:
+      _PrintXcodeError('Could not verify status of Spotlight on the startup '
+                       'disk.')
+      _PrintXcodeError('mdutil exited with %s: "%s".' % (returncode,
+                                                         output_single_line))
+      self._PrintSpotlightDisabledMessaging()
+      return returncode
+    if 'Indexing enabled' not in output:
+      _PrintXcodeError('Spotlight has been turned off on the startup disk.')
+      _PrintXcodeError('Status returned from mdutil was "%s".' %
+                       output_single_line)
+      self._PrintSpotlightDisabledMessaging()
+      return -1
+    return 0
+
   @staticmethod
   def _SplitPathComponents(path):
     """Splits the given path into an array of all of its components."""
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj
index f280b77..617009c 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj
@@ -912,6 +912,7 @@
 				SDKROOT = iphoneos;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Application.app/Application";
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -930,6 +931,7 @@
 				PRODUCT_NAME = Application;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = Debug;
@@ -983,6 +985,7 @@
 				PRODUCT_NAME = TodayExtension;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = Debug;
@@ -1088,6 +1091,7 @@
 				SDKROOT = iphoneos;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Application.app/Application";
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -1106,6 +1110,7 @@
 				PRODUCT_NAME = Application;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = Release;
@@ -1160,6 +1165,7 @@
 				PRODUCT_NAME = TodayExtension;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = Release;
@@ -1272,6 +1278,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Application.app/Application";
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -1298,6 +1305,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = __TulsiTestRunner_Debug;
@@ -1364,6 +1372,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = __TulsiTestRunner_Debug;
@@ -1390,6 +1399,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Application.app/Application";
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -1416,6 +1426,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = __TulsiTestRunner_Release;
@@ -1483,6 +1494,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = __TulsiTestRunner_Release;
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/IosLegacyTestProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/IosLegacyTestProject.xcodeproj/project.pbxproj
index aefa031..6bc227a 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/IosLegacyTestProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/IosLegacyTestProject.xcodeproj/project.pbxproj
@@ -224,6 +224,7 @@
 				PRODUCT_NAME = LegacyTests;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_ios_legacy_test;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = Debug;
@@ -290,6 +291,7 @@
 				PRODUCT_NAME = LegacyTests;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_ios_legacy_test;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = Release;
@@ -368,6 +370,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_ios_legacy_test;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = __TulsiTestRunner_Debug;
@@ -434,6 +437,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_ios_legacy_test;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = __TulsiTestRunner_Release;
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj
index 7a9ffec..96d91b5 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj
@@ -365,6 +365,7 @@
 				PRODUCT_NAME = MyCommandLineApp;
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = Debug;
@@ -382,6 +383,7 @@
 				PRODUCT_NAME = MyMacOSApp;
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = Debug;
@@ -399,6 +401,7 @@
 				PRODUCT_NAME = MyTodayExtension;
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = Debug;
@@ -466,6 +469,7 @@
 				PRODUCT_NAME = MyCommandLineApp;
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = Release;
@@ -483,6 +487,7 @@
 				PRODUCT_NAME = MyMacOSApp;
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = Release;
@@ -500,6 +505,7 @@
 				PRODUCT_NAME = MyTodayExtension;
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = Release;
@@ -579,6 +585,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = __TulsiTestRunner_Debug;
@@ -604,6 +611,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = __TulsiTestRunner_Debug;
@@ -629,6 +637,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = __TulsiTestRunner_Debug;
@@ -696,6 +705,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = __TulsiTestRunner_Release;
@@ -721,6 +731,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = __TulsiTestRunner_Release;
@@ -746,6 +757,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = __TulsiTestRunner_Release;
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/project.pbxproj
index 7160f92..d542b3a 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/project.pbxproj
@@ -456,6 +456,7 @@
 				SDKROOT = macosx;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MyMacOSApp.app/Contents/MacOS/MyMacOSApp";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -474,6 +475,7 @@
 				PRODUCT_NAME = MyMacOSApp;
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = Debug;
@@ -492,6 +494,7 @@
 				SDKROOT = macosx;
 				TEST_TARGET_NAME = MyMacOSApp;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -546,6 +549,7 @@
 				PRODUCT_NAME = UnitTestsNoHost;
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -592,6 +596,7 @@
 				SDKROOT = macosx;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MyMacOSApp.app/Contents/MacOS/MyMacOSApp";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -610,6 +615,7 @@
 				PRODUCT_NAME = MyMacOSApp;
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = Release;
@@ -628,6 +634,7 @@
 				SDKROOT = macosx;
 				TEST_TARGET_NAME = MyMacOSApp;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -683,6 +690,7 @@
 				PRODUCT_NAME = UnitTestsNoHost;
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -736,6 +744,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MyMacOSApp.app/Contents/MacOS/MyMacOSApp";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -762,6 +771,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = __TulsiTestRunner_Debug;
@@ -787,6 +797,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TEST_TARGET_NAME = MyMacOSApp;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -853,6 +864,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -880,6 +892,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MyMacOSApp.app/Contents/MacOS/MyMacOSApp";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -906,6 +919,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = __TulsiTestRunner_Release;
@@ -931,6 +945,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TEST_TARGET_NAME = MyMacOSApp;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -998,6 +1013,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/project.pbxproj
index 0d188d5..f652db2 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/project.pbxproj
@@ -281,6 +281,7 @@
 				PRODUCT_NAME = ccBinary;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_ccsimple;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = Debug;
@@ -347,6 +348,7 @@
 				PRODUCT_NAME = ccBinary;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_ccsimple;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = Release;
@@ -412,6 +414,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_ccsimple;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = __TulsiTestRunner_Debug;
@@ -478,6 +481,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_ccsimple;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = __TulsiTestRunner_Release;
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj
index a4ba119..9d06c5e 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj
@@ -526,6 +526,7 @@
 				SDKROOT = iphoneos;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Application.app/Application";
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -544,6 +545,7 @@
 				PRODUCT_NAME = Application;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = Debug;
@@ -597,6 +599,7 @@
 				PRODUCT_NAME = TargetApplication;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = Debug;
@@ -659,6 +662,7 @@
 				SDKROOT = iphoneos;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Application.app/Application";
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -677,6 +681,7 @@
 				PRODUCT_NAME = Application;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = Release;
@@ -731,6 +736,7 @@
 				PRODUCT_NAME = TargetApplication;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = Release;
@@ -800,6 +806,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Application.app/Application";
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -826,6 +833,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = __TulsiTestRunner_Debug;
@@ -892,6 +900,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = __TulsiTestRunner_Debug;
@@ -918,6 +927,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Application.app/Application";
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -944,6 +954,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = __TulsiTestRunner_Release;
@@ -1011,6 +1022,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = __TulsiTestRunner_Release;
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/project.pbxproj
index 4c9580e..6d61d0e 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/project.pbxproj
@@ -708,6 +708,7 @@
 				SDKROOT = iphoneos;
 				TEST_TARGET_NAME = SkylarkApplication;
 				TULSI_BUILD_PATH = tulsi_e2e_simple_skylark;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -726,6 +727,7 @@
 				PRODUCT_NAME = SkylarkApp;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_simple_skylark;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = Debug;
@@ -746,6 +748,7 @@
 				SWIFT_INCLUDE_PATHS = "$(inherited) $(TULSI_BWRS)/tulsi-includes/x/x/tulsi_e2e_simple_skylark/XCTestCodeSwift/_objs";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SkylarkApplication.app/SkylarkApplication";
 				TULSI_BUILD_PATH = tulsi_e2e_simple_skylark;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -801,6 +804,7 @@
 				PRODUCT_NAME = SkylarkTargetApplication;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_simple_skylark;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = Debug;
@@ -818,6 +822,7 @@
 				PRODUCT_NAME = StickerExtension;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_simple_skylark;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = Debug;
@@ -906,6 +911,7 @@
 				SDKROOT = iphoneos;
 				TEST_TARGET_NAME = SkylarkApplication;
 				TULSI_BUILD_PATH = tulsi_e2e_simple_skylark;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -924,6 +930,7 @@
 				PRODUCT_NAME = SkylarkApp;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_simple_skylark;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = Release;
@@ -944,6 +951,7 @@
 				SWIFT_INCLUDE_PATHS = "$(inherited) $(TULSI_BWRS)/tulsi-includes/x/x/tulsi_e2e_simple_skylark/XCTestCodeSwift/_objs";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SkylarkApplication.app/SkylarkApplication";
 				TULSI_BUILD_PATH = tulsi_e2e_simple_skylark;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -1000,6 +1008,7 @@
 				PRODUCT_NAME = SkylarkTargetApplication;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_simple_skylark;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = Release;
@@ -1017,6 +1026,7 @@
 				PRODUCT_NAME = StickerExtension;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_simple_skylark;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = Release;
@@ -1112,6 +1122,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TEST_TARGET_NAME = SkylarkApplication;
 				TULSI_BUILD_PATH = tulsi_e2e_simple_skylark;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -1138,6 +1149,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_simple_skylark;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = __TulsiTestRunner_Debug;
@@ -1165,6 +1177,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SkylarkApplication.app/SkylarkApplication";
 				TULSI_BUILD_PATH = tulsi_e2e_simple_skylark;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -1233,6 +1246,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_simple_skylark;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = __TulsiTestRunner_Debug;
@@ -1258,6 +1272,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_simple_skylark;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = __TulsiTestRunner_Debug;
@@ -1283,6 +1298,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TEST_TARGET_NAME = SkylarkApplication;
 				TULSI_BUILD_PATH = tulsi_e2e_simple_skylark;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -1309,6 +1325,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_simple_skylark;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = __TulsiTestRunner_Release;
@@ -1336,6 +1353,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SkylarkApplication.app/SkylarkApplication";
 				TULSI_BUILD_PATH = tulsi_e2e_simple_skylark;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -1405,6 +1423,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_simple_skylark;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = __TulsiTestRunner_Release;
@@ -1430,6 +1449,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_simple_skylark;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = __TulsiTestRunner_Release;
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj
index 9ef02e1..848e003 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj
@@ -358,6 +358,7 @@
 				PRODUCT_NAME = Application;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_swift;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = Debug;
@@ -455,6 +456,7 @@
 				PRODUCT_NAME = Application;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_swift;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = Release;
@@ -564,6 +566,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_swift;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = __TulsiTestRunner_Debug;
@@ -632,6 +635,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_swift;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = __TulsiTestRunner_Release;
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj
index cdf8bf0..ef4e1da 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj
@@ -495,6 +495,7 @@
 				SDKROOT = iphoneos;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/One;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -513,6 +514,7 @@
 				PRODUCT_NAME = TestApplication;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = TestSuite;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = Debug;
@@ -532,6 +534,7 @@
 				SDKROOT = iphoneos;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Two;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -552,6 +555,7 @@
 				SDKROOT = iphoneos;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -606,6 +610,7 @@
 				PRODUCT_NAME = LogicTest;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = TestSuite/One;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -639,6 +644,7 @@
 				SDKROOT = iphoneos;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/One;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -657,6 +663,7 @@
 				PRODUCT_NAME = TestApplication;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = TestSuite;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = Release;
@@ -676,6 +683,7 @@
 				SDKROOT = iphoneos;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Two;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -696,6 +704,7 @@
 				SDKROOT = iphoneos;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -751,6 +760,7 @@
 				PRODUCT_NAME = LogicTest;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = TestSuite/One;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -791,6 +801,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/One;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -817,6 +828,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = TestSuite;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = __TulsiTestRunner_Debug;
@@ -843,6 +855,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Two;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -870,6 +883,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -936,6 +950,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = TestSuite/One;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -963,6 +978,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/One;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -989,6 +1005,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = TestSuite;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = __TulsiTestRunner_Release;
@@ -1015,6 +1032,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Two;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -1042,6 +1060,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -1109,6 +1128,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = TestSuite/One;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj
index 141d885..bd696d9 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj
@@ -318,6 +318,7 @@
 				SDKROOT = iphoneos;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -336,6 +337,7 @@
 				PRODUCT_NAME = TestApplication;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = TestSuite;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = Debug;
@@ -404,6 +406,7 @@
 				SDKROOT = iphoneos;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -422,6 +425,7 @@
 				PRODUCT_NAME = TestApplication;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = TestSuite;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = Release;
@@ -498,6 +502,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -524,6 +529,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = TestSuite;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = __TulsiTestRunner_Debug;
@@ -591,6 +597,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -617,6 +624,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = TestSuite;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = __TulsiTestRunner_Release;
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj
index d4ce005..2193bae 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj
@@ -434,6 +434,7 @@
 				SDKROOT = iphoneos;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -452,6 +453,7 @@
 				PRODUCT_NAME = TestApplication;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = TestSuite;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = Debug;
@@ -471,6 +473,7 @@
 				SDKROOT = iphoneos;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -491,6 +494,7 @@
 				SDKROOT = iphoneos;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -560,6 +564,7 @@
 				SDKROOT = iphoneos;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -578,6 +583,7 @@
 				PRODUCT_NAME = TestApplication;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = TestSuite;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = Release;
@@ -597,6 +603,7 @@
 				SDKROOT = iphoneos;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -617,6 +624,7 @@
 				SDKROOT = iphoneos;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -694,6 +702,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -720,6 +729,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = TestSuite;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = __TulsiTestRunner_Debug;
@@ -746,6 +756,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -773,6 +784,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -841,6 +853,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -867,6 +880,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = TestSuite;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = __TulsiTestRunner_Release;
@@ -893,6 +907,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
@@ -920,6 +935,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				TULSI_TEST_RUNNER_ONLY = YES;
 			};
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj
index 4df78c3..dd5dc36 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj
@@ -424,6 +424,7 @@
 				PRODUCT_NAME = Application;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = Debug;
@@ -440,6 +441,7 @@
 				PRODUCT_NAME = WatchApplication;
 				SDKROOT = watchos;
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
@@ -457,6 +459,7 @@
 				PRODUCT_NAME = WatchExtension;
 				SDKROOT = watchos;
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
@@ -538,6 +541,7 @@
 				PRODUCT_NAME = Application;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = Release;
@@ -554,6 +558,7 @@
 				PRODUCT_NAME = WatchApplication;
 				SDKROOT = watchos;
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
@@ -571,6 +576,7 @@
 				PRODUCT_NAME = WatchExtension;
 				SDKROOT = watchos;
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
@@ -664,6 +670,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 			};
 			name = __TulsiTestRunner_Debug;
@@ -688,6 +695,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
@@ -713,6 +721,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = NO;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
@@ -781,6 +790,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 			};
 			name = __TulsiTestRunner_Release;
@@ -805,6 +815,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
@@ -830,6 +841,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
+				TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK = NO;
 				TULSI_MUST_USE_DSYM = YES;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
diff --git a/src/TulsiGeneratorTests/PBXTargetGeneratorTests.swift b/src/TulsiGeneratorTests/PBXTargetGeneratorTests.swift
index 1a05e72..61b8fc6 100644
--- a/src/TulsiGeneratorTests/PBXTargetGeneratorTests.swift
+++ b/src/TulsiGeneratorTests/PBXTargetGeneratorTests.swift
@@ -335,6 +335,7 @@
           "PRODUCT_NAME": rule1TargetName,
           "SDKROOT": "iphoneos",
           "TULSI_BUILD_PATH": rule1BuildPath,
+          "TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK": "NO",
           "TULSI_MUST_USE_DSYM": "NO",
       ]
       let expectedTarget = TargetDefinition(
@@ -372,6 +373,7 @@
           "PRODUCT_NAME": rule2TargetName,
           "SDKROOT": "iphoneos",
           "TULSI_BUILD_PATH": rule2BuildPath,
+          "TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK": "NO",
           "TULSI_MUST_USE_DSYM": "NO",
       ]
       let expectedTarget = TargetDefinition(
@@ -447,6 +449,7 @@
           "PRODUCT_NAME": rule1TargetName,
           "SDKROOT": "iphoneos",
           "TULSI_BUILD_PATH": rule1BuildPath,
+          "TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK": "NO",
           "TULSI_MUST_USE_DSYM": "NO",
       ]
       let expectedTarget = TargetDefinition(
@@ -487,6 +490,7 @@
           "SDKROOT": "iphoneos",
           "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/\(rule1TargetName).app/\(rule1TargetName)",
           "TULSI_BUILD_PATH": rule2BuildPath,
+          "TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK": "NO",
           "TULSI_MUST_USE_DSYM": "NO",
           "TULSI_TEST_RUNNER_ONLY": "YES",
       ]
@@ -559,6 +563,7 @@
         "PRODUCT_NAME": rule1TargetName,
         "SDKROOT": "iphoneos",
         "TULSI_BUILD_PATH": rule1BuildPath,
+        "TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK": "NO",
         "TULSI_MUST_USE_DSYM": "NO",
         ]
       let expectedTarget = TargetDefinition(
@@ -598,6 +603,7 @@
         "SDKROOT": "iphoneos",
         "TEST_TARGET_NAME": rule1TargetName,
         "TULSI_BUILD_PATH": rule2BuildPath,
+        "TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK": "NO",
         "TULSI_TEST_RUNNER_ONLY": "YES",
         "TULSI_MUST_USE_DSYM": "NO",
         ]
@@ -674,6 +680,7 @@
         "PRODUCT_NAME": rule1TargetName,
         "SDKROOT": "macosx",
         "TULSI_BUILD_PATH": rule1BuildPath,
+        "TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK": "NO",
         "TULSI_MUST_USE_DSYM": "NO",
         ]
       let expectedTarget = TargetDefinition(
@@ -714,6 +721,7 @@
         "SDKROOT": "macosx",
         "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/\(rule1TargetName).app/Contents/MacOS/\(rule1TargetName)",
         "TULSI_BUILD_PATH": rule2BuildPath,
+        "TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK": "NO",
         "TULSI_MUST_USE_DSYM": "NO",
         "TULSI_TEST_RUNNER_ONLY": "YES",
         ]
@@ -790,6 +798,7 @@
         "PRODUCT_NAME": rule1TargetName,
         "SDKROOT": "macosx",
         "TULSI_BUILD_PATH": rule1BuildPath,
+        "TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK": "NO",
         "TULSI_MUST_USE_DSYM": "NO",
         ]
       let expectedTarget = TargetDefinition(
@@ -829,6 +838,7 @@
         "SDKROOT": "macosx",
         "TEST_TARGET_NAME": rule1TargetName,
         "TULSI_BUILD_PATH": rule2BuildPath,
+        "TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK": "NO",
         "TULSI_MUST_USE_DSYM": "NO",
         "TULSI_TEST_RUNNER_ONLY": "YES",
         ]
@@ -895,6 +905,7 @@
         "PRODUCT_NAME": rule1TargetName,
         "SDKROOT": "macosx",
         "TULSI_BUILD_PATH": rule1BuildPath,
+        "TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK": "NO",
         "TULSI_MUST_USE_DSYM": "NO",
         "TULSI_TEST_RUNNER_ONLY": "YES",
         ]
@@ -963,6 +974,7 @@
         "PRODUCT_NAME": rule1TargetName,
         "SDKROOT": "macosx",
         "TULSI_BUILD_PATH": rule1BuildPath,
+        "TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK": "NO",
         "TULSI_MUST_USE_DSYM": "NO",
         "TULSI_TEST_RUNNER_ONLY": "YES",
         ]
@@ -1038,6 +1050,7 @@
           "PRODUCT_NAME": rule1TargetName,
           "SDKROOT": "iphoneos",
           "TULSI_BUILD_PATH": rule1BuildPath,
+          "TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK": "NO",
           "TULSI_MUST_USE_DSYM": "NO",
       ]
       let expectedTarget = TargetDefinition(
@@ -1079,6 +1092,7 @@
           "SDKROOT": "iphoneos",
           "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/\(rule1TargetName).app/\(rule1TargetName)",
           "TULSI_BUILD_PATH": testRuleBuildPath,
+          "TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK": "NO",
           "TULSI_MUST_USE_DSYM": "NO",
           "TULSI_TEST_RUNNER_ONLY": "YES",
       ]
@@ -1165,6 +1179,7 @@
       "SDKROOT": "iphoneos",
       "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/\(testHostTargetName).app/\(testHostTargetName)",
       "TULSI_BUILD_PATH": testRulePackage,
+      "TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK": "NO",
       "TULSI_MUST_USE_DSYM": "NO",
       "TULSI_TEST_RUNNER_ONLY": "YES",
       ]
@@ -1250,6 +1265,7 @@
       "SDKROOT": "iphoneos",
       "TEST_HOST": "$(BUILT_PRODUCTS_DIR)/\(testHostTargetName).app/\(testHostTargetName)",
       "TULSI_BUILD_PATH": testRulePackage,
+      "TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK": "NO",
       "TULSI_MUST_USE_DSYM": "NO",
       "TULSI_TEST_RUNNER_ONLY": "YES",
       ]
@@ -1330,6 +1346,7 @@
         "PRODUCT_NAME": rule1TargetName,
         "SDKROOT": "iphoneos",
         "TULSI_BUILD_PATH": rule1BuildPath,
+        "TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK": "NO",
         "TULSI_MUST_USE_DSYM": "NO",
         ]
       let expectedTarget = TargetDefinition(
@@ -1370,6 +1387,7 @@
         "SDKROOT": "iphoneos",
         "TEST_TARGET_NAME": rule1TargetName,
         "TULSI_BUILD_PATH": testRuleBuildPath,
+        "TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK": "NO",
         "TULSI_MUST_USE_DSYM": "NO",
         "TULSI_TEST_RUNNER_ONLY": "YES",
         ]
@@ -1492,6 +1510,7 @@
           "PRODUCT_NAME": testRuleTargetName,
           "SDKROOT": "iphoneos",
           "TULSI_BUILD_PATH": testRuleBuildPath,
+          "TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK": "NO",
           "TULSI_MUST_USE_DSYM": "NO",
       ]
       var testRunnerExpectedBuildSettings = expectedBuildSettings
@@ -1560,6 +1579,7 @@
           "PRODUCT_NAME": "test-test1-SameName",
           "SDKROOT": "iphoneos",
           "TULSI_BUILD_PATH": rule1BuildPath,
+          "TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK": "NO",
           "TULSI_MUST_USE_DSYM": "NO",
       ]
       let expectedTarget = TargetDefinition(
@@ -1597,6 +1617,7 @@
           "PRODUCT_NAME": "test-test2-SameName",
           "SDKROOT": "iphoneos",
           "TULSI_BUILD_PATH": rule2BuildPath,
+          "TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK": "NO",
           "TULSI_MUST_USE_DSYM": "NO",
       ]
       let expectedTarget = TargetDefinition(
@@ -1660,6 +1681,7 @@
           "PRODUCT_NAME": targetName,
           "SDKROOT": "iphoneos",
           "TULSI_BUILD_PATH": buildPath,
+          "TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK": "NO",
           "TULSI_MUST_USE_DSYM": "NO",
       ]
       let expectedTarget = TargetDefinition(
@@ -1722,6 +1744,7 @@
         "PRODUCT_NAME": bundleName,
         "SDKROOT": "iphoneos",
         "TULSI_BUILD_PATH": buildPath,
+        "TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK": "NO",
         "TULSI_MUST_USE_DSYM": "NO",
       ]
       let expectedTarget = TargetDefinition(
@@ -1811,6 +1834,7 @@
           "SDKROOT": "iphoneos",
           "IPHONEOS_DEPLOYMENT_TARGET": "9.0",
           "TULSI_BUILD_PATH": appBuildPath,
+          "TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK": "NO",
           "TULSI_MUST_USE_DSYM": "NO",
       ]
       let expectedTarget = TargetDefinition(
@@ -1850,6 +1874,7 @@
           "SDKROOT": "watchos",
           "WATCHOS_DEPLOYMENT_TARGET": "2.0",
           "TULSI_BUILD_PATH": watchAppBuildPath,
+          "TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK": "NO",
           "TULSI_MUST_USE_DSYM": "NO",
       ]
       let expectedTarget = TargetDefinition(
@@ -1889,6 +1914,7 @@
           "SDKROOT": "watchos",
           "WATCHOS_DEPLOYMENT_TARGET": "2.0",
           "TULSI_BUILD_PATH": watchExtBuildPath,
+          "TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK": "NO",
           "TULSI_MUST_USE_DSYM": "NO",
       ]
       let expectedTarget = TargetDefinition(
@@ -1975,6 +2001,7 @@
         "SDKROOT": "macosx",
         "MACOSX_DEPLOYMENT_TARGET": "10.12",
         "TULSI_BUILD_PATH": appBuildPath,
+        "TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK": "NO",
         "TULSI_MUST_USE_DSYM": "NO",
       ]
       let expectedTarget = TargetDefinition(
@@ -2014,6 +2041,7 @@
         "SDKROOT": "macosx",
         "MACOSX_DEPLOYMENT_TARGET": "10.12",
         "TULSI_BUILD_PATH": macAppExtBuildPath,
+        "TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK": "NO",
         "TULSI_MUST_USE_DSYM": "NO",
       ]
       let expectedTarget = TargetDefinition(
@@ -2053,6 +2081,7 @@
         "SDKROOT": "macosx",
         "MACOSX_DEPLOYMENT_TARGET": "10.12",
         "TULSI_BUILD_PATH": macCLIAppBuildPath,
+        "TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK": "NO",
         "TULSI_MUST_USE_DSYM": "NO",
       ]
       let expectedTarget = TargetDefinition(
@@ -2538,6 +2567,7 @@
         "PRODUCT_NAME": targetName,
         "SDKROOT": "iphoneos",
         "TULSI_BUILD_PATH": package,
+        "TULSI_BUILD_WITHOUT_SPOTLIGHT_AT_MY_OWN_RISK": "NO",
         "TULSI_MUST_USE_DSYM": "YES",
     ]
     let expectedTarget = TargetDefinition(