Revert of Issue #1998638, since it broke drush si and other command-line scripts.