diff --git a/build-system/Make/Make.py b/build-system/Make/Make.py
index 971c8c2d80..bd2d011b0c 100644
--- a/build-system/Make/Make.py
+++ b/build-system/Make/Make.py
@@ -148,18 +148,7 @@ class BazelCommandLine:
         self.disable_provisioning_profiles = True
 
     def set_configuration(self, configuration):
-        if configuration == 'debug_universal':
-            self.configuration_args = [
-                # bazel debug build configuration
-                '-c', 'dbg',
-
-                # Build universal binaries.
-                '--ios_multi_cpus=armv7,arm64',
-
-                # Always build universal Watch binaries.
-                '--watchos_cpus=arm64_32'
-            ] + self.common_debug_args
-        elif configuration == 'debug_arm64':
+        if configuration == 'debug_arm64':
             self.configuration_args = [
                 # bazel debug build configuration
                 '-c', 'dbg',
@@ -189,16 +178,6 @@ class BazelCommandLine:
                 # Build single-architecture binaries. It is almost 2 times faster is 32-bit support is not required.
                 '--ios_multi_cpus=sim_arm64',
 
-                # Always build universal Watch binaries.
-                '--watchos_cpus=arm64_32'
-            ] + self.common_debug_args
-        elif configuration == 'debug_armv7':
-            self.configuration_args = [
-                # bazel debug build configuration
-                '-c', 'dbg',
-
-                '--ios_multi_cpus=armv7',
-
                 # Always build universal Watch binaries.
                 '--watchos_cpus=arm64_32'
             ] + self.common_debug_args
@@ -217,41 +196,10 @@ class BazelCommandLine:
                 '--apple_generate_dsym',
 
                 # Require DSYM files as build output.
-                '--output_groups=+dsyms'
-            ] + self.common_release_args
-        elif configuration == 'release_armv7':
-            self.configuration_args = [
-                # bazel optimized build configuration
-                '-c', 'opt',
+                '--output_groups=+dsyms',
 
-                # Build single-architecture binaries. It is almost 2 times faster is 32-bit support is not required.
-                '--ios_multi_cpus=armv7',
-
-                # Always build universal Watch binaries.
-                '--watchos_cpus=arm64_32',
-
-                # Generate DSYM files when building.
-                '--apple_generate_dsym',
-
-                # Require DSYM files as build output.
-                '--output_groups=+dsyms'
-            ] + self.common_release_args
-        elif configuration == 'release_universal':
-            self.configuration_args = [
-                # bazel optimized build configuration
-                '-c', 'opt',
-
-                # Build universal binaries.
-                '--ios_multi_cpus=armv7,arm64',
-
-                # Always build universal Watch binaries.
-                '--watchos_cpus=arm64_32',
-                
-                # Generate DSYM files when building.
-                '--apple_generate_dsym',
-
-                # Require DSYM files as build output.
-                '--output_groups=+dsyms'
+                '--swiftcopt=-num-threads',
+                '--swiftcopt=0',
             ] + self.common_release_args
         else:
             raise Exception('Unknown configuration {}'.format(configuration))