Revert fix of bug 8326 in r18461, plus an unrelated change to DefaultSettings.php.