Revert of Enable recipe bootstrap by default

recipes.py

 #!/usr/bin/env python
 # Copyright 2015 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """Tool to interact with recipe repositories.
 
 This tool operates on the nearest ancestor directory containing an
 infra/config/recipes.cfg.
 """
@@ skipping 416 matching lines @@
   parser.add_argument(
       '--verbose', '-v', action='count',
       help='Increase logging verboisty')
   # TODO(phajdan.jr): Figure out if we need --no-fetch; remove if not.
   parser.add_argument(
       '--no-fetch', action='store_true',
       help='Disable automatic fetching')
   parser.add_argument('-O', '--project-override', metavar='ID=PATH',
       action=ProjectOverrideAction,
       help='Override a project repository path with a local one.')
-  # TODO(phajdan.jr): Remove bootstrap switches once established as default.
   parser.add_argument(
-      '--use-bootstrap', action='store_true', default=True,
+      '--use-bootstrap', action='store_true',
       help='Use bootstrap/bootstrap.py to create a isolated python virtualenv'
            ' with required python dependencies.')
   parser.add_argument(
-      '--disable-bootstrap', action='store_false', dest='use_bootstrap',
-      help='Disables bootstrap (see --use-bootstrap)')
-  parser.add_argument(
       '--operational-args-path', action='store',
       type=os.path.abspath,
       help='The path to an operational Arguments file. If provided, this file '
            'must contain a JSONPB-encoded Arguments protobuf message, and will '
            'be integrated into the runtime parameters.')
 
   subp = parser.add_subparsers()
 
   fetch_p = subp.add_parser(
       'fetch',
@@ skipping 310 matching lines @@
 
   if not isinstance(ret, int):
     if ret is None:
       ret = 0
     else:
       print >> sys.stderr, ret
       ret = 1
   sys.stdout.flush()
   sys.stderr.flush()
   os._exit(ret)