--- install.php	2009-12-27 18:32:21.000000000 -0500
+++ install.php	2009-12-27 18:32:57.000000000 -0500
@@ -2,23 +2,20 @@
 // $Id: install.php,v 1.228 2009/12/07 06:19:20 webchick Exp $
 
 /**
+ * @file
+ * Initiates a browser-based installation of Drupal.
+ */
+
+/**
  * Root directory of Drupal installation.
  */
 define('DRUPAL_ROOT', getcwd());
 
-require_once DRUPAL_ROOT . '/includes/install.inc';
-
 /**
  * Global flag to indicate that site is in installation mode.
  */
 define('MAINTENANCE_MODE', 'install');
 
-// TODO: This if() statement allows Drupal to be installed interactively when
-// install.php is visited in a web browser, while simultaneously allowing the
-// file to be included by command line scripts so that it can be used as an
-// API. It should be removed after the API functions in this file have been
-// moved out to a separate, reusable location.
-if (php_sapi_name() != 'cli' && !empty($_SERVER['REMOTE_ADDR'])) {
-  // Start the installer.
-  install_drupal();
-}
+// Start the installer.
+require_once DRUPAL_ROOT . '/includes/install.core.inc';
+install_drupal();