diff --git a/scripts/setup/pcntl_available.php b/scripts/setup/pcntl_available.php
deleted file mode 100755
index 5664a6eb2c..0000000000
--- a/scripts/setup/pcntl_available.php
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-if (extension_loaded('pcntl')) {
-  echo "YES\n";
-} else {
-  echo "NO\n";
-}
diff --git a/src/infrastructure/PhabricatorSetup.php b/src/infrastructure/PhabricatorSetup.php
index 43f3149129..90924393a4 100644
--- a/src/infrastructure/PhabricatorSetup.php
+++ b/src/infrastructure/PhabricatorSetup.php
@@ -1,483 +1,398 @@
 <?php
 
 final class PhabricatorSetup {
 
   public static function runSetup() {
     header("Content-Type: text/plain");
     self::write("PHABRICATOR SETUP\n\n");
 
     // Force browser to stop buffering.
     self::write(str_repeat(' ', 2048));
     usleep(250000);
 
     self::write("This setup mode will guide you through setting up your ".
                 "Phabricator configuration.\n");
 
     self::writeHeader("CORE CONFIGURATION");
 
     // NOTE: Test this first since other tests depend on the ability to
     // execute system commands and will fail if safe_mode is enabled.
     $safe_mode = ini_get('safe_mode');
     if ($safe_mode) {
       self::writeFailure();
       self::write(
         "Setup failure! You have 'safe_mode' enabled. Phabricator will not ".
         "run in safe mode, and it has been deprecated in PHP 5.3 and removed ".
         "in PHP 5.4.\n");
       return;
     } else {
       self::write(" okay  PHP's deprecated 'safe_mode' is disabled.\n");
     }
 
     // NOTE: Also test this early since we can't include files from other
     // libraries if this is set strictly.
 
     $open_basedir = ini_get('open_basedir');
     if ($open_basedir) {
 
       // 'open_basedir' restricts which files we're allowed to access with
       // file operations. This might be okay -- we don't need to write to
       // arbitrary places in the filesystem -- but we need to access certain
       // resources. This setting is unlikely to be providing any real measure
       // of security so warn even if things look OK.
 
       try {
         $open_libphutil = class_exists('Future');
       } catch (Exception $ex) {
         $message = $ex->getMessage();
         self::write("Unable to load modules from libphutil: {$message}\n");
         $open_libphutil = false;
       }
 
       try {
         $open_arcanist = class_exists('ArcanistDiffParser');
       } catch (Exception $ex) {
         $message = $ex->getMessage();
         self::write("Unable to load modules from Arcanist: {$message}\n");
         $open_arcanist = false;
       }
 
       $open_urandom = false;
       try {
         Filesystem::readRandomBytes(1);
         $open_urandom = true;
       } catch (FilesystemException $ex) {
         self::write($ex->getMessage()."\n");
       }
 
       try {
         $tmp = new TempFile();
         file_put_contents($tmp, '.');
         $open_tmp = @fopen((string)$tmp, 'r');
       } catch (Exception $ex) {
         $message = $ex->getMessage();
         $dir = sys_get_temp_dir();
         self::write("Unable to open temp files from '{$dir}': {$message}\n");
         $open_tmp = false;
       }
 
       if (!$open_urandom || !$open_tmp || !$open_libphutil || !$open_arcanist) {
         self::writeFailure();
         self::write(
           "Setup failure! Your server is configured with 'open_basedir' in ".
           "php.ini which prevents Phabricator from opening files it needs to ".
           "access. Either make the setting more permissive or remove it. It ".
           "is unlikely you derive significant security benefits from having ".
           "this configured; files outside this directory can still be ".
           "accessed through system command execution.");
         return;
       } else {
         self::write(
           "[WARN] You have an 'open_basedir' configured in your php.ini. ".
           "Although the setting seems permissive enough that Phabricator ".
           "will run properly, you may run into problems because of it. It is ".
           "unlikely you gain much real security benefit from having it ".
           "configured, because the application can still access files outside ".
           "the 'open_basedir' by running system commands.\n");
       }
     } else {
       self::write(" okay  'open_basedir' is not set.\n");
     }
 
     if (!PhabricatorEnv::getEnvConfig('security.alternate-file-domain')) {
       self::write(
         "[WARN] You have not configured 'security.alternate-file-domain'. ".
         "This makes your installation vulnerable to attack. Make sure you ".
         "read the documentation for this parameter and understand the ".
         "consequences of leaving it unconfigured.\n");
     }
 
     $path = getenv('PATH');
     if (empty($path)) {
       self::writeFailure();
       self::write(
         "Setup failure! The environmental \$PATH variable is empty. ".
         "Phabricator needs to execute system commands like 'svn', 'git', ".
         "'hg', and 'diff'. Set up your webserver so that it passes a valid ".
         "\$PATH to the PHP process.\n\n");
       if (php_sapi_name() == 'fpm-fcgi') {
         self::write(
           "You're running php-fpm, so the easiest way to do this is to add ".
           "this line to your php-fpm.conf:\n\n".
           "  env[PATH] = /usr/local/bin:/usr/bin:/bin\n\n".
           "Then restart php-fpm.\n");
       }
       return;
     } else {
       self::write(" okay  \$PATH is nonempty.\n");
     }
 
     self::write("[OKAY] Core configuration OKAY.\n");
 
     self::writeHeader("REQUIRED PHP EXTENSIONS");
     $extensions = array(
       'mysql',
       'hash',
       'json',
       'openssl',
       'mbstring',
       'iconv',
 
       // There is a chance we might not need this, but some configurations (like
       // OAuth or Amazon SES) will require it. Just mark it 'required' since
       // it's widely available and relatively core.
       'curl',
     );
     foreach ($extensions as $extension) {
       $ok = self::requireExtension($extension);
       if (!$ok) {
         self::writeFailure();
         self::write("Setup failure! Install PHP extension '{$extension}'.");
         return;
       }
     }
 
-    list($err, $stdout, $stderr) = exec_manual('which php');
-    if ($err) {
-      self::writeFailure();
-      self::write("Unable to locate 'php' on the command line from the web ".
-                  "server. Verify that 'php' is in the webserver's PATH.\n".
-                  "   err: {$err}\n".
-                  "stdout: {$stdout}\n".
-                  "stderr: {$stderr}\n");
-      return;
-    } else {
-      self::write(" okay  PHP binary found on the command line.\n");
-      $php_bin = trim($stdout);
-    }
-
-    // NOTE: In cPanel + suphp installs, 'php' may be the PHP CGI SAPI, not the
-    // PHP CLI SAPI. proc_open() will pass the environment to the child process,
-    // which will re-execute the webpage (causing an infinite number of
-    // processes to spawn). To test that the 'php' binary is safe to execute,
-    // we call php_sapi_name() using "env -i" to wipe the environment so it
-    // doesn't execute another reuqest if it's the wrong binary. We can't use
-    // "-r" because php-cgi doesn't support that flag.
-
-    $tmp_file = new TempFile('sapi.php');
-    Filesystem::writeFile($tmp_file, '<?php echo php_sapi_name();');
-
-    list($err, $stdout, $stderr) = exec_manual(
-      '/usr/bin/env -i %s -f %s',
-      $php_bin,
-      $tmp_file);
-    if ($err) {
-      self::writeFailure();
-      self::write("Unable to execute 'php' on the command line from the web ".
-                  "server.\n".
-                  "   err: {$err}\n".
-                  "stdout: {$stdout}\n".
-                  "stderr: {$stderr}\n");
-      return;
-    } else {
-      self::write(" okay  PHP is available from the command line.\n");
-
-      $sapi = trim($stdout);
-      if ($sapi != 'cli') {
-        self::writeFailure();
-        self::write(
-          "The 'php' binary on this system uses the '{$sapi}' SAPI, but the ".
-          "'cli' SAPI is expected. Replace 'php' with the php-cli SAPI ".
-          "binary, or edit your webserver configuration so the first 'php' ".
-          "in PATH is the 'cli' SAPI.\n\n".
-          "If you're running cPanel with suphp, the easiest way to fix this ".
-          "is to add '/usr/local/bin' before '/usr/bin' for 'env_path' in ".
-          "suconf.php:\n\n".
-          '  env_path="/bin:/usr/local/bin:/usr/bin"'.
-          "\n\n");
-        return;
-      } else {
-        self::write(" okay  'php' is CLI SAPI.\n");
-      }
-    }
-
     $root = dirname(phutil_get_library_root('phabricator'));
 
-    // On RHEL6, doing a distro install of pcntl makes it available from the
-    // CLI binary but not from the Apache module. This isn't entirely
-    // unreasonable and we don't need it from Apache, so do an explicit test
-    // for CLI availability.
-    list($err, $stdout, $stderr) = exec_manual(
-      'php %s',
-      "{$root}/scripts/setup/pcntl_available.php");
-    if ($err) {
-      self::writeFailure();
-      self::write("Unable to execute scripts/setup/pcntl_available.php to ".
-                  "test for the availability of pcntl from the CLI.\n".
-                  "   err: {$err}\n".
-                  "stdout: {$stdout}\n".
-                  "stderr: {$stderr}\n");
-      return;
-    } else {
-      if (trim($stdout) == 'YES') {
-        self::write(" okay  pcntl is available from the command line.\n");
-        self::write("[OKAY] All extensions OKAY\n");
-      } else {
-        self::write(" warn  pcntl is not available!\n");
-        self::write("[WARN] *** WARNING *** pcntl extension not available. ".
-                    "You will not be able to run daemons.\n");
-      }
-    }
-
     self::writeHeader("GIT SUBMODULES");
     if (!Filesystem::pathExists($root.'/.git')) {
       self::write(" skip  Not a git clone.\n\n");
     } else {
       list($info) = execx(
         '(cd %s && git submodule status)',
         $root);
       foreach (explode("\n", rtrim($info)) as $line) {
         $matches = null;
         if (!preg_match('/^(.)([0-9a-f]{40}) (\S+)(?: |$)/', $line, $matches)) {
           self::writeFailure();
           self::write(
             "Setup failure! 'git submodule' produced unexpected output:\n".
             $line);
           return;
         }
 
         $status = $matches[1];
         $module = $matches[3];
 
         switch ($status) {
           case '-':
           case '+':
           case 'U':
             self::writeFailure();
             self::write(
               "Setup failure! Git submodule '{$module}' is not up to date. ".
               "Run:\n\n".
               "  cd {$root} && git submodule update --init\n\n".
               "...to update submodules.");
             return;
           case ' ':
             self::write(" okay  Git submodule '{$module}' up to date.\n");
             break;
           default:
             self::writeFailure();
             self::write(
               "Setup failure! 'git submodule' reported unknown status ".
               "'{$status}' for submodule '{$module}'. This is a bug; report ".
               "it to the Phabricator maintainers.");
             return;
         }
       }
     }
     self::write("[OKAY] All submodules OKAY.\n");
 
     self::writeHeader("BASIC CONFIGURATION");
 
     $env = PhabricatorEnv::getEnvConfig('phabricator.env');
     if ($env == 'production' || $env == 'default' || $env == 'development') {
       self::writeFailure();
       self::write(
         "Setup failure! Your PHABRICATOR_ENV is set to '{$env}', which is ".
         "a Phabricator environmental default. You should create a custom ".
         "environmental configuration instead of editing the defaults ".
         "directly. See this document for instructions:\n");
         self::writeDoc('article/Configuration_Guide.html');
       return;
     } else {
       $host = PhabricatorEnv::getEnvConfig('phabricator.base-uri');
       $host_uri = new PhutilURI($host);
       $protocol = $host_uri->getProtocol();
       $allowed_protocols = array(
         'http'  => true,
         'https' => true,
       );
       if (empty($allowed_protocols[$protocol])) {
         self::writeFailure();
         self::write(
           "You must specify the protocol over which your host works (e.g.: ".
           "\"http:// or https://\")\nin your custom config file.\nRefer to ".
           "'default.conf.php' for documentation on configuration options.\n");
         return;
       }
       if (preg_match('/.*\/$/', $host)) {
         self::write(" okay  phabricator.base-uri protocol\n");
       } else {
         self::writeFailure();
         self::write(
           "You must add a trailing slash at the end of the host\n(e.g.: ".
           "\"http://phabricator.example.com/ instead of ".
           "http://phabricator.example.com\")\nin your custom config file.".
           "\nRefer to 'default.conf.php' for documentation on configuration ".
           "options.\n");
         return;
       }
 
       $host_domain = $host_uri->getDomain();
       if (strpos($host_domain, '.') !== false) {
         self::write(" okay  phabricator.base-uri domain\n");
       } else {
         self::writeFailure();
         self::write(
           "You must host Phabricator on a domain that contains a dot ('.'). ".
           "The current domain, '{$host_domain}', does not have a dot, so some ".
           "browsers will not set cookies on it. For instance, ".
           "'http://example.com/ is OK, but 'http://example/' won't work. ".
           "If you are using localhost, create an entry in the hosts file like ".
           "'127.0.0.1 example.com', and access the localhost with ".
           "'http://example.com/'.");
         return;
       }
 
       $host_path = $host_uri->getPath();
       if ($host_path == '/') {
         self::write(" okay  phabricator.base-uri path\n");
       } else {
         self::writeFailure();
         self::write(
           "Your 'phabricator.base-uri' setting includes a path, but should ".
           "not (e.g., 'http://phabricator.example.com/' is OK, but ".
           "'http://example.com/phabricator/' is not). Phabricator must be ".
           "installed on an entire domain, it can not be installed on a ".
           "path alongside other applications. Consult the documentation ".
           "for more details.");
         return;
       }
     }
 
     self::write("[OKAY] Basic configuration OKAY\n");
 
     self::writeHeader("MySQL DATABASE & STORAGE CONFIGURATION");
 
     $conf = PhabricatorEnv::newObjectFromConfig('mysql.configuration-provider');
     $conn_user = $conf->getUser();
     $conn_pass = $conf->getPassword();
     $conn_host = $conf->getHost();
 
     self::write(" okay  Trying to connect to MySQL database ".
                 "{$conn_user}@{$conn_host}...\n");
 
     ini_set('mysql.connect_timeout', 2);
 
     $conn_raw = PhabricatorEnv::newObjectFromConfig(
       'mysql.implementation',
       array(
         array(
           'user'      => $conn_user,
           'pass'      => $conn_pass,
           'host'      => $conn_host,
           'database'  => null,
         ),
       ));
 
     try {
       queryfx($conn_raw, 'SELECT 1');
       self::write(" okay  Connection successful!\n");
     } catch (AphrontQueryConnectionException $ex) {
       $message = $ex->getMessage();
       self::writeFailure();
       self::write(
         "Setup failure! MySQL exception: {$message} \n".
         "Edit Phabricator configuration keys 'mysql.user', ".
         "'mysql.host' and 'mysql.pass' to enable Phabricator ".
         "to connect.");
       return;
     }
 
     $engines = queryfx_all($conn_raw, 'SHOW ENGINES');
     $engines = ipull($engines, 'Support', 'Engine');
 
     $innodb = idx($engines, 'InnoDB');
     if ($innodb != 'YES' && $innodb != 'DEFAULT') {
       self::writeFailure();
       self::write(
         "Setup failure! The 'InnoDB' engine is not available. Enable ".
         "InnoDB in your MySQL configuration. If you already created tables, ".
         "MySQL incorrectly used some other engine. You need to convert ".
         "them or drop and reinitialize them.");
       return;
     } else {
       self::write(" okay  InnoDB is available.\n");
     }
 
     $namespace = PhabricatorEnv::getEnvConfig('storage.default-namespace');
 
     $databases = queryfx_all($conn_raw, 'SHOW DATABASES');
     $databases = ipull($databases, 'Database', 'Database');
     if (empty($databases[$namespace.'_meta_data'])) {
       self::writeFailure();
       self::write(
         "Setup failure! You haven't run 'bin/storage upgrade'. See this ".
         "article for instructions:\n");
       self::writeDoc('article/Configuration_Guide.html');
       return;
     } else {
       self::write(" okay  Databases have been initialized.\n");
     }
 
     self::write("[OKAY] Database and storage configuration OKAY\n");
 
     self::writeHeader('SUCCESS!');
     self::write(
       "Congratulations! Your setup seems mostly correct, or at least fairly ".
       "reasonable.\n\n".
       "*** NEXT STEP ***\n".
       "Edit your configuration file (conf/{$env}.conf.php) and remove the ".
       "'phabricator.setup' line to finish installation.");
 
   }
 
   public static function requireExtension($extension) {
     if (extension_loaded($extension)) {
       self::write(" okay  Extension '{$extension}' installed.\n");
       return true;
     } else {
       self::write("[FAIL] Extension '{$extension}' is NOT INSTALLED!\n");
       return false;
     }
   }
 
   private static function writeFailure() {
     self::write("\n\n<<< *** FAILURE! *** >>>\n");
   }
 
   private static function write($str) {
     echo $str;
     ob_flush();
     flush();
 
     // This, uh, makes it look cool. -_-
     usleep(20000);
   }
 
   public static function writeHeader($header) {
     $template = '>>>'.str_repeat('-', 77);
     $template = substr_replace(
       $template,
       '  '.$header.'  ',
       3,
       strlen($header) + 4);
     self::write("\n\n{$template}\n\n");
   }
 
   public static function writeDoc($doc) {
     self::write(
       "\n".
       '    http://www.phabricator.com/docs/phabricator/'.$doc.
       "\n\n");
   }
 
 }