diff --git a/autoninja.py b/autoninja.py
index ed3ceb6d5..3b862cff5 100755
--- a/autoninja.py
+++ b/autoninja.py
@@ -58,7 +58,6 @@ for index, arg in enumerate(input_args[1:]):
     output_dir = arg[2:]
 
 use_goma = False
-use_jumbo_build = False
 
 # Attempt to auto-detect goma usage.  We support gn-based builds, where we
 # look for args.gn in the build tree, and cmake-based builds where we look for
@@ -70,11 +69,6 @@ if os.path.exists(os.path.join(output_dir, 'args.gn')):
       if re.match(r'^\s*use_goma\s*=\s*true(\s*$|\s*#.*$)', line):
         use_goma = True
         continue
-      match_use_jumbo_build = re.match(
-          r'^\s*use_jumbo_build\s*=\s*true(\s*$|\s*#.*$)', line)
-      if match_use_jumbo_build:
-        use_jumbo_build = True
-        continue
 elif os.path.exists(os.path.join(output_dir, 'rules.ninja')):
   with open(os.path.join(output_dir, 'rules.ninja')) as file_handle:
     for line in file_handle:
@@ -122,13 +116,6 @@ if not j_specified and not t_specified:
     j_value = num_cores
     # Ninja defaults to |num_cores + 2|
     j_value += int(os.environ.get('NINJA_CORE_ADDITION', '2'))
-    if use_jumbo_build:
-      # Compiling a jumbo .o can easily use 1-2GB of memory. Leaving 2GB per
-      # process avoids memory swap/compression storms when also considering
-      # already in-use memory.
-      physical_ram = psutil.virtual_memory().total
-      GB = 1024 * 1024 * 1024
-      j_value = min(j_value, physical_ram / (2 * GB))
     args.append('-j')
     args.append('%d' % j_value)
 
diff --git a/compile_single_file.py b/compile_single_file.py
index 9c9952146..833e03ef6 100644
--- a/compile_single_file.py
+++ b/compile_single_file.py
@@ -40,10 +40,7 @@ def main():
       required=True)
   parser.add_argument(
       '--build-dir',
-      help='The build directory, relative to the source directory. Jumbo '
-           'builds aren\'t supported but you can create a non-jumbo build '
-           'config just for this script and keep using jumbo in your regular '
-           'builds.',
+      help='The build directory, relative to the source directory.',
       required=True)
 
   options = parser.parse_args()
diff --git a/ninjalog_uploader.py b/ninjalog_uploader.py
index a56d26fc1..2db0155b9 100755
--- a/ninjalog_uploader.py
+++ b/ninjalog_uploader.py
@@ -29,8 +29,7 @@ import time
 import httplib2
 
 # These build configs affect build performance a lot.
-# TODO(tikuta): Add 'blink_symbol_level', 'closure_compile' and
-#               'use_jumbo_build'.
+# TODO(tikuta): Add 'blink_symbol_level'and 'closure_compile'.
 WHITELISTED_CONFIGS = ('symbol_level', 'use_goma', 'is_debug',
                        'is_component_build', 'enable_nacl', 'host_os',
                        'host_cpu', 'target_os', 'target_cpu')