diff --git a/mozilla/webtools/bugzilla/Bugzilla/Attachment.pm b/mozilla/webtools/bugzilla/Bugzilla/Attachment.pm
index 0ed77974f87..f012c3f2e75 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Attachment.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Attachment.pm
@@ -50,7 +50,6 @@ that users upload to the Bugzilla server.
 use Bugzilla::Constants;
 use Bugzilla::Error;
 use Bugzilla::Flag;
-use Bugzilla::Config;
 use Bugzilla::User;
 use Bugzilla::Util qw(trick_taint);
 
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Auth.pm b/mozilla/webtools/bugzilla/Bugzilla/Auth.pm
index b6d378a435f..40a0917efa0 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Auth.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Auth.pm
@@ -32,7 +32,6 @@ use fields qw(
 
 use Bugzilla::Constants;
 use Bugzilla::Error;
-use Bugzilla::Config;
 use Bugzilla::Auth::Login::Stack;
 use Bugzilla::Auth::Verify::Stack;
 use Bugzilla::Auth::Persist::Cookie;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/CGI.pm b/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/CGI.pm
index d0c29d8aa82..033cb992b65 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/CGI.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/CGI.pm
@@ -33,7 +33,6 @@ use strict;
 use base qw(Bugzilla::Auth::Login);
 use constant user_can_create_account => 1;
 
-use Bugzilla::Config;
 use Bugzilla::Constants;
 use Bugzilla::Util;
 use Bugzilla::Error;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/Env.pm b/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/Env.pm
index f9837b3e670..180e79ba7cf 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/Env.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/Env.pm
@@ -24,7 +24,6 @@ package Bugzilla::Auth::Login::Env;
 use strict;
 use base qw(Bugzilla::Auth::Login);
 
-use Bugzilla::Config;
 use Bugzilla::Constants;
 use Bugzilla::Error;
 
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Auth/Persist/Cookie.pm b/mozilla/webtools/bugzilla/Bugzilla/Auth/Persist/Cookie.pm
index 3d8599c188c..3faa892aeb7 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Auth/Persist/Cookie.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Auth/Persist/Cookie.pm
@@ -32,7 +32,6 @@ package Bugzilla::Auth::Persist::Cookie;
 use strict;
 use fields qw();
 
-use Bugzilla::Config;
 use Bugzilla::Constants;
 use Bugzilla::Util;
 use Bugzilla::Token;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Auth/Verify/LDAP.pm b/mozilla/webtools/bugzilla/Bugzilla/Auth/Verify/LDAP.pm
index 7136195893e..9f050d85492 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Auth/Verify/LDAP.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Auth/Verify/LDAP.pm
@@ -35,7 +35,6 @@ use fields qw(
     ldap
 );
 
-use Bugzilla::Config;
 use Bugzilla::Constants;
 use Bugzilla::Error;
 
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Bug.pm b/mozilla/webtools/bugzilla/Bugzilla/Bug.pm
index 72ca270930b..64da19af493 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Bug.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Bug.pm
@@ -33,7 +33,6 @@ use strict;
 use CGI::Carp qw(fatalsToBrowser);
 
 use Bugzilla::Attachment;
-use Bugzilla::Config;
 use Bugzilla::Constants;
 use Bugzilla::Field;
 use Bugzilla::Flag;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/BugMail.pm b/mozilla/webtools/bugzilla/Bugzilla/BugMail.pm
index dc6efc7351f..ddcf4791e31 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/BugMail.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/BugMail.pm
@@ -35,7 +35,6 @@ package Bugzilla::BugMail;
 use Bugzilla::Error;
 use Bugzilla::User;
 use Bugzilla::Constants;
-use Bugzilla::Config;
 use Bugzilla::Util;
 use Bugzilla::Bug;
 use Bugzilla::Product;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Config.pm b/mozilla/webtools/bugzilla/Bugzilla/Config.pm
index c4a23f9cbe1..57c60dbb03c 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Config.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Config.pm
@@ -35,9 +35,6 @@ use strict;
 use base qw(Exporter);
 use Bugzilla::Constants;
 
-# Module stuff
-@Bugzilla::Config::EXPORT = qw(Param);
-
 # Don't export localvars by default - people should have to explicitly
 # ask for it, as a (probably futile) attempt to stop code using it
 # when it shouldn't
@@ -92,28 +89,6 @@ sub param_panels {
     return @param_panels;
 }
 
-sub Param {
-    my ($param) = @_;
-
-    _load_params unless %params;
-    my %param_values = %{Bugzilla->params};
-
-    # By this stage, the param must be in the hash
-    die "Can't find param named $param" unless (exists $params{$param});
-
-    # When module startup code runs (which is does even via -c, when using
-    # |use|), we may try to grab params which don't exist yet. This affects
-    # tests, so have this as a fallback for the -c case
-    return $params{$param}->{default} 
-        if ($^C && not exists $param_values{$param});
-
-    # If we have a value for the param, return it
-    return $param_values{$param} if exists $param_values{$param};
-
-    # Else error out
-    die "No value for param $param (try running checksetup.pl again)";
-}
-
 sub SetParam {
     my ($name, $value) = @_;
 
@@ -277,11 +252,6 @@ Bugzilla::Config - Configuration parameters for Bugzilla
 
 =head1 SYNOPSIS
 
-  # Getting parameters
-  use Bugzilla::Config;
-
-  my $fooSetting = Bugzilla->params->{'foo'};
-
   # Administration functions
   use Bugzilla::Config qw(:admin);
 
@@ -305,11 +275,6 @@ Parameters can be set, retrieved, and updated.
 
 =over 4
 
-=item C<Bugzilla->params->{$name}>
-
-Returns the Param with the specified name. Either a string, or, in the case
-of multiple-choice parameters, an array reference.
-
 =item C<SetParam($name, $value)>
 
 Sets the param named $name to $value. Values are checked using the checker
diff --git a/mozilla/webtools/bugzilla/Bugzilla/DB.pm b/mozilla/webtools/bugzilla/Bugzilla/DB.pm
index 3d30dd7781f..044aa3dea29 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/DB.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/DB.pm
@@ -35,7 +35,7 @@ use DBI;
 # Inherit the DB class from DBI::db.
 use base qw(DBI::db);
 
-use Bugzilla::Config qw(:DEFAULT :db);
+use Bugzilla::Config qw(:db);
 use Bugzilla::Constants;
 use Bugzilla::Util;
 use Bugzilla::Error;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Flag.pm b/mozilla/webtools/bugzilla/Bugzilla/Flag.pm
index 8646e72ac68..50721f159d2 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Flag.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Flag.pm
@@ -61,7 +61,6 @@ package Bugzilla::Flag;
 
 use Bugzilla::FlagType;
 use Bugzilla::User;
-use Bugzilla::Config;
 use Bugzilla::Util;
 use Bugzilla::Error;
 use Bugzilla::Mailer;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/FlagType.pm b/mozilla/webtools/bugzilla/Bugzilla/FlagType.pm
index 078f6de71e3..ce4f31e687b 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/FlagType.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/FlagType.pm
@@ -59,7 +59,6 @@ use Bugzilla::User;
 
 use Bugzilla::Error;
 use Bugzilla::Util;
-use Bugzilla::Config;
 
 ######################################################################
 # Global Variables
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Mailer.pm b/mozilla/webtools/bugzilla/Bugzilla/Mailer.pm
index 9f51c71e017..15df6bddd40 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Mailer.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Mailer.pm
@@ -37,7 +37,6 @@ use base qw(Exporter);
 @Bugzilla::Mailer::EXPORT = qw(MessageToMTA);
 
 use Bugzilla::Constants;
-use Bugzilla::Config;
 use Bugzilla::Util;
 
 use Mail::Header;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Search.pm b/mozilla/webtools/bugzilla/Bugzilla/Search.pm
index f9bf553884c..e8da89204f0 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Search.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Search.pm
@@ -34,7 +34,6 @@ package Bugzilla::Search;
 use base qw(Exporter);
 @Bugzilla::Search::EXPORT = qw(IsValidQueryType);
 
-use Bugzilla::Config;
 use Bugzilla::Error;
 use Bugzilla::Util;
 use Bugzilla::Constants;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Search/Quicksearch.pm b/mozilla/webtools/bugzilla/Bugzilla/Search/Quicksearch.pm
index 48b825318da..eba9bac017a 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Search/Quicksearch.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Search/Quicksearch.pm
@@ -23,7 +23,6 @@ package Bugzilla::Search::Quicksearch;
 # Make it harder for us to do dangerous things in Perl.
 use strict;
 
-use Bugzilla::Config;
 use Bugzilla::Error;
 use Bugzilla::Constants;
 use Bugzilla::Keyword;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Template.pm b/mozilla/webtools/bugzilla/Bugzilla/Template.pm
index 65d93751045..6094d649985 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Template.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Template.pm
@@ -35,7 +35,6 @@ package Bugzilla::Template;
 use strict;
 
 use Bugzilla::Constants;
-use Bugzilla::Config;
 use Bugzilla::Util;
 use Bugzilla::User;
 use Bugzilla::Error;
@@ -771,7 +770,7 @@ sub create {
         # Default variables for all templates
         VARIABLES => {
             # Function for retrieving global parameters.
-            'Param' => \&Bugzilla::Config::Param,
+            'Param' => sub { return Bugzilla->params->{$_[0]}; },
 
             # Function to create date strings
             'time2str' => \&Date::Format::time2str,
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Template/Plugin/Hook.pm b/mozilla/webtools/bugzilla/Bugzilla/Template/Plugin/Hook.pm
index 6f744a8aa52..a5eec820b23 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Template/Plugin/Hook.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Template/Plugin/Hook.pm
@@ -25,7 +25,6 @@ package Bugzilla::Template::Plugin::Hook;
 
 use strict;
 
-use Bugzilla::Config;
 use Bugzilla::Constants;
 use Bugzilla::Template;
 use Bugzilla::Util;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Token.pm b/mozilla/webtools/bugzilla/Bugzilla/Token.pm
index c2e11f5a3b0..c570c34b16d 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Token.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Token.pm
@@ -29,7 +29,6 @@ use strict;
 # Bundle the functions in this file together into the "Bugzilla::Token" package.
 package Bugzilla::Token;
 
-use Bugzilla::Config;
 use Bugzilla::Error;
 use Bugzilla::Mailer;
 use Bugzilla::Util;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/User.pm b/mozilla/webtools/bugzilla/Bugzilla/User.pm
index 1c30ce024f9..9977ca86c69 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/User.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/User.pm
@@ -40,7 +40,6 @@ use strict;
 # This module implements utilities for dealing with Bugzilla users.
 package Bugzilla::User;
 
-use Bugzilla::Config;
 use Bugzilla::Error;
 use Bugzilla::Util;
 use Bugzilla::Constants;
diff --git a/mozilla/webtools/bugzilla/attachment.cgi b/mozilla/webtools/bugzilla/attachment.cgi
index 3ed2984c477..fcbd100200e 100755
--- a/mozilla/webtools/bugzilla/attachment.cgi
+++ b/mozilla/webtools/bugzilla/attachment.cgi
@@ -38,7 +38,7 @@ use strict;
 use lib qw(.);
 
 use Bugzilla;
-use Bugzilla::Config qw(:DEFAULT :localconfig);
+use Bugzilla::Config qw(:localconfig);
 use Bugzilla::Constants;
 use Bugzilla::Error;
 use Bugzilla::Flag; 
diff --git a/mozilla/webtools/bugzilla/buglist.cgi b/mozilla/webtools/bugzilla/buglist.cgi
index 0fcf13b8831..937749d28a1 100755
--- a/mozilla/webtools/bugzilla/buglist.cgi
+++ b/mozilla/webtools/bugzilla/buglist.cgi
@@ -38,7 +38,6 @@ use Bugzilla;
 use Bugzilla::Constants;
 use Bugzilla::Error;
 use Bugzilla::Util;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::Search;
 use Bugzilla::Search::Quicksearch;
 use Bugzilla::User;
diff --git a/mozilla/webtools/bugzilla/chart.cgi b/mozilla/webtools/bugzilla/chart.cgi
index b40a8113e40..fd70258553b 100755
--- a/mozilla/webtools/bugzilla/chart.cgi
+++ b/mozilla/webtools/bugzilla/chart.cgi
@@ -47,7 +47,6 @@ use lib qw(.);
 
 use Bugzilla;
 use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::Error;
 use Bugzilla::Util;
 use Bugzilla::Chart;
diff --git a/mozilla/webtools/bugzilla/checksetup.pl b/mozilla/webtools/bugzilla/checksetup.pl
index ba4efd0e4df..fae29156961 100755
--- a/mozilla/webtools/bugzilla/checksetup.pl
+++ b/mozilla/webtools/bugzilla/checksetup.pl
@@ -517,7 +517,7 @@ BEGIN {
     $::ENV{'PATH'} = $env;
 
     require Bugzilla::Config;
-    import Bugzilla::Config qw(:DEFAULT :admin);
+    import Bugzilla::Config qw(:admin);
 }
 
 # 12/17/00 justdave@syndicomm.com - removed declarations of the localconfig
diff --git a/mozilla/webtools/bugzilla/colchange.cgi b/mozilla/webtools/bugzilla/colchange.cgi
index 6d737d5c742..3f06ca533e9 100755
--- a/mozilla/webtools/bugzilla/colchange.cgi
+++ b/mozilla/webtools/bugzilla/colchange.cgi
@@ -27,7 +27,6 @@ use lib qw(.);
 
 use Bugzilla;
 use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::Error;
 use Bugzilla::User;
 use Bugzilla::Keyword;
diff --git a/mozilla/webtools/bugzilla/collectstats.pl b/mozilla/webtools/bugzilla/collectstats.pl
index 2f76e544f3f..0739d031227 100755
--- a/mozilla/webtools/bugzilla/collectstats.pl
+++ b/mozilla/webtools/bugzilla/collectstats.pl
@@ -37,7 +37,6 @@ use lib ".";
 
 use Bugzilla;
 use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::Util;
 use Bugzilla::Search;
 use Bugzilla::User;
diff --git a/mozilla/webtools/bugzilla/config.cgi b/mozilla/webtools/bugzilla/config.cgi
index 3675a342fd4..2ebcea18167 100755
--- a/mozilla/webtools/bugzilla/config.cgi
+++ b/mozilla/webtools/bugzilla/config.cgi
@@ -32,7 +32,6 @@ use lib qw(.);
 
 use Bugzilla;
 use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::Error;
 use Bugzilla::Keyword;
 use Bugzilla::Bug;
diff --git a/mozilla/webtools/bugzilla/contrib/bug_email.pl b/mozilla/webtools/bugzilla/contrib/bug_email.pl
index bf7ad5e63f5..dfba1e2462c 100755
--- a/mozilla/webtools/bugzilla/contrib/bug_email.pl
+++ b/mozilla/webtools/bugzilla/contrib/bug_email.pl
@@ -38,7 +38,7 @@
 #
 # You need to work with bug_email.pl the MIME::Parser installed.
 # 
-# $Id: bug_email.pl,v 1.43 2006-07-03 21:26:22 mkanat%bugzilla.org Exp $
+# $Id: bug_email.pl,v 1.44 2006-07-03 21:42:47 mkanat%bugzilla.org Exp $
 ###############################################################
 
 # 02/12/2000 (SML)
@@ -91,7 +91,6 @@ use lib "../";
 
 use Bugzilla;
 use BugzillaEmail;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::Constants;
 use Bugzilla::Util;
 use Bugzilla::BugMail;
diff --git a/mozilla/webtools/bugzilla/contrib/bugzilla_email_append.pl b/mozilla/webtools/bugzilla/contrib/bugzilla_email_append.pl
index fef46f01b69..4b2e53f2099 100755
--- a/mozilla/webtools/bugzilla/contrib/bugzilla_email_append.pl
+++ b/mozilla/webtools/bugzilla/contrib/bugzilla_email_append.pl
@@ -40,7 +40,6 @@ BEGIN {
 use Bugzilla;
 use Bugzilla::Constants;
 use BugzillaEmail;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::BugMail;
 
 my $dbh = Bugzilla->dbh;
diff --git a/mozilla/webtools/bugzilla/contrib/merge-users.pl b/mozilla/webtools/bugzilla/contrib/merge-users.pl
index 540b22fb95d..2458755e6f3 100755
--- a/mozilla/webtools/bugzilla/contrib/merge-users.pl
+++ b/mozilla/webtools/bugzilla/contrib/merge-users.pl
@@ -48,7 +48,6 @@ use lib qw(.);
 
 use Bugzilla;
 use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::Util;
 
 use Getopt::Long;
diff --git a/mozilla/webtools/bugzilla/contrib/sendbugmail.pl b/mozilla/webtools/bugzilla/contrib/sendbugmail.pl
index 2e962b55772..55904cf85f7 100755
--- a/mozilla/webtools/bugzilla/contrib/sendbugmail.pl
+++ b/mozilla/webtools/bugzilla/contrib/sendbugmail.pl
@@ -4,7 +4,7 @@
 #
 # Nick Barnes, Ravenbrook Limited, 2004-04-01.
 #
-# $Id: sendbugmail.pl,v 1.6 2006-07-03 21:26:22 mkanat%bugzilla.org Exp $
+# $Id: sendbugmail.pl,v 1.7 2006-07-03 21:42:47 mkanat%bugzilla.org Exp $
 # 
 # Bugzilla email script for Bugzilla 2.17.4 and later.  Invoke this to send
 # bugmail for a bug which has been changed directly in the database.
@@ -17,7 +17,6 @@
 use lib qw(.);
 
 use Bugzilla;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::Util;
 use Bugzilla::BugMail;
 use Bugzilla::User;
diff --git a/mozilla/webtools/bugzilla/contrib/syncLDAP.pl b/mozilla/webtools/bugzilla/contrib/syncLDAP.pl
index 4ddabacea57..32d01f15046 100755
--- a/mozilla/webtools/bugzilla/contrib/syncLDAP.pl
+++ b/mozilla/webtools/bugzilla/contrib/syncLDAP.pl
@@ -26,7 +26,6 @@ use lib qw(.);
 
 use Net::LDAP;
 use Bugzilla;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::User;
 
 my $cgi = Bugzilla->cgi;
diff --git a/mozilla/webtools/bugzilla/createaccount.cgi b/mozilla/webtools/bugzilla/createaccount.cgi
index a0f1ed2c37a..ab011f3366d 100755
--- a/mozilla/webtools/bugzilla/createaccount.cgi
+++ b/mozilla/webtools/bugzilla/createaccount.cgi
@@ -30,7 +30,6 @@ use lib qw(.);
 
 use Bugzilla;
 use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::Error;
 use Bugzilla::User;
 use Bugzilla::BugMail;
diff --git a/mozilla/webtools/bugzilla/duplicates.cgi b/mozilla/webtools/bugzilla/duplicates.cgi
index 1de3fe15ce6..7934c5c8f1a 100755
--- a/mozilla/webtools/bugzilla/duplicates.cgi
+++ b/mozilla/webtools/bugzilla/duplicates.cgi
@@ -31,7 +31,6 @@ use lib qw(.);
 
 use Bugzilla;
 use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::Util;
 use Bugzilla::Error;
 use Bugzilla::Search;
diff --git a/mozilla/webtools/bugzilla/editclassifications.cgi b/mozilla/webtools/bugzilla/editclassifications.cgi
index 23ac30d37c6..70aa256fbd8 100755
--- a/mozilla/webtools/bugzilla/editclassifications.cgi
+++ b/mozilla/webtools/bugzilla/editclassifications.cgi
@@ -27,7 +27,6 @@ use Bugzilla;
 use Bugzilla::Constants;
 use Bugzilla::Util;
 use Bugzilla::Error;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::Classification;
 
 my $cgi = Bugzilla->cgi;
diff --git a/mozilla/webtools/bugzilla/editcomponents.cgi b/mozilla/webtools/bugzilla/editcomponents.cgi
index 244e83e55e5..e66e95195fc 100755
--- a/mozilla/webtools/bugzilla/editcomponents.cgi
+++ b/mozilla/webtools/bugzilla/editcomponents.cgi
@@ -31,7 +31,6 @@ use lib ".";
 
 use Bugzilla;
 use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::Series;
 use Bugzilla::Util;
 use Bugzilla::Error;
diff --git a/mozilla/webtools/bugzilla/editgroups.cgi b/mozilla/webtools/bugzilla/editgroups.cgi
index f511a68a663..39e78e9e6fa 100755
--- a/mozilla/webtools/bugzilla/editgroups.cgi
+++ b/mozilla/webtools/bugzilla/editgroups.cgi
@@ -29,7 +29,7 @@ use lib ".";
 
 use Bugzilla;
 use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT :admin);
+use Bugzilla::Config qw(:admin);
 use Bugzilla::Util;
 use Bugzilla::Error;
 use Bugzilla::Group;
diff --git a/mozilla/webtools/bugzilla/editparams.cgi b/mozilla/webtools/bugzilla/editparams.cgi
index 27db4654faf..5ae2bcc2599 100755
--- a/mozilla/webtools/bugzilla/editparams.cgi
+++ b/mozilla/webtools/bugzilla/editparams.cgi
@@ -27,7 +27,7 @@ use lib ".";
 
 use Bugzilla;
 use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT :admin);
+use Bugzilla::Config qw(:admin);
 use Bugzilla::Config::Common;
 use Bugzilla::Util;
 use Bugzilla::Error;
diff --git a/mozilla/webtools/bugzilla/editproducts.cgi b/mozilla/webtools/bugzilla/editproducts.cgi
index 8a0dd5fe87c..2d2f81009a3 100755
--- a/mozilla/webtools/bugzilla/editproducts.cgi
+++ b/mozilla/webtools/bugzilla/editproducts.cgi
@@ -36,7 +36,6 @@ use lib ".";
 
 use Bugzilla;
 use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::Util;
 use Bugzilla::Error;
 use Bugzilla::Bug;
diff --git a/mozilla/webtools/bugzilla/editusers.cgi b/mozilla/webtools/bugzilla/editusers.cgi
index 42a7d6e3ab7..86e2cf424e9 100755
--- a/mozilla/webtools/bugzilla/editusers.cgi
+++ b/mozilla/webtools/bugzilla/editusers.cgi
@@ -25,7 +25,6 @@ use lib ".";
 
 use Bugzilla;
 use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::Util;
 use Bugzilla::Error;
 use Bugzilla::User;
diff --git a/mozilla/webtools/bugzilla/editvalues.cgi b/mozilla/webtools/bugzilla/editvalues.cgi
index c812c6c8799..013e82be787 100755
--- a/mozilla/webtools/bugzilla/editvalues.cgi
+++ b/mozilla/webtools/bugzilla/editvalues.cgi
@@ -25,7 +25,7 @@ use Bugzilla;
 use Bugzilla::Util;
 use Bugzilla::Error;
 use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT :admin);
+use Bugzilla::Config qw(:admin);
 
 # List of different tables that contain the changeable field values
 # (the old "enums.") Keep them in alphabetical order by their 
diff --git a/mozilla/webtools/bugzilla/editwhines.cgi b/mozilla/webtools/bugzilla/editwhines.cgi
index 282b66ddb44..f0fddeb5b2a 100755
--- a/mozilla/webtools/bugzilla/editwhines.cgi
+++ b/mozilla/webtools/bugzilla/editwhines.cgi
@@ -31,7 +31,6 @@ use lib ".";
 
 use Bugzilla;
 use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::Util;
 use Bugzilla::Error;
 use Bugzilla::User;
diff --git a/mozilla/webtools/bugzilla/enter_bug.cgi b/mozilla/webtools/bugzilla/enter_bug.cgi
index 929e690c843..e5463b5011c 100755
--- a/mozilla/webtools/bugzilla/enter_bug.cgi
+++ b/mozilla/webtools/bugzilla/enter_bug.cgi
@@ -39,7 +39,6 @@ use lib qw(.);
 
 use Bugzilla;
 use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::Util;
 use Bugzilla::Error;
 use Bugzilla::Bug;
diff --git a/mozilla/webtools/bugzilla/importxml.pl b/mozilla/webtools/bugzilla/importxml.pl
index 263508b373a..6ed2727ea47 100755
--- a/mozilla/webtools/bugzilla/importxml.pl
+++ b/mozilla/webtools/bugzilla/importxml.pl
@@ -79,7 +79,6 @@ use Bugzilla::Version;
 use Bugzilla::Component;
 use Bugzilla::Milestone;
 use Bugzilla::FlagType;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::BugMail;
 use Bugzilla::Mailer;
 use Bugzilla::User;
diff --git a/mozilla/webtools/bugzilla/index.cgi b/mozilla/webtools/bugzilla/index.cgi
index 3a591a32c25..9c3b6be9677 100755
--- a/mozilla/webtools/bugzilla/index.cgi
+++ b/mozilla/webtools/bugzilla/index.cgi
@@ -33,7 +33,6 @@ use lib ".";
 
 use Bugzilla;
 use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::Error;
 use Bugzilla::Update;
 
diff --git a/mozilla/webtools/bugzilla/post_bug.cgi b/mozilla/webtools/bugzilla/post_bug.cgi
index 702ff96a42e..6dcc776a4a7 100755
--- a/mozilla/webtools/bugzilla/post_bug.cgi
+++ b/mozilla/webtools/bugzilla/post_bug.cgi
@@ -30,7 +30,6 @@ use lib qw(.);
 use Bugzilla;
 use Bugzilla::Attachment;
 use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::Util;
 use Bugzilla::Error;
 use Bugzilla::Bug;
diff --git a/mozilla/webtools/bugzilla/process_bug.cgi b/mozilla/webtools/bugzilla/process_bug.cgi
index ec2e8f5fdc3..fa34ae70959 100755
--- a/mozilla/webtools/bugzilla/process_bug.cgi
+++ b/mozilla/webtools/bugzilla/process_bug.cgi
@@ -45,7 +45,6 @@ use lib qw(.);
 
 use Bugzilla;
 use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::Bug;
 use Bugzilla::Mailer;
 use Bugzilla::User;
diff --git a/mozilla/webtools/bugzilla/query.cgi b/mozilla/webtools/bugzilla/query.cgi
index 382fa37c401..9c2067d3e74 100755
--- a/mozilla/webtools/bugzilla/query.cgi
+++ b/mozilla/webtools/bugzilla/query.cgi
@@ -31,7 +31,6 @@ use lib ".";
 use Bugzilla;
 use Bugzilla::Bug;
 use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::Search;
 use Bugzilla::User;
 use Bugzilla::Util;
diff --git a/mozilla/webtools/bugzilla/quips.cgi b/mozilla/webtools/bugzilla/quips.cgi
index c405e089c08..06b6b0dd819 100755
--- a/mozilla/webtools/bugzilla/quips.cgi
+++ b/mozilla/webtools/bugzilla/quips.cgi
@@ -29,7 +29,6 @@ use lib qw(.);
 
 use Bugzilla;
 use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::Util;
 use Bugzilla::Error;
 use Bugzilla::User;
diff --git a/mozilla/webtools/bugzilla/reports.cgi b/mozilla/webtools/bugzilla/reports.cgi
index 09b8dc30e73..6c7a4ea3985 100755
--- a/mozilla/webtools/bugzilla/reports.cgi
+++ b/mozilla/webtools/bugzilla/reports.cgi
@@ -39,7 +39,6 @@ use lib qw(.);
 
 use Bugzilla;
 use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::Util;
 use Bugzilla::Error;
 
diff --git a/mozilla/webtools/bugzilla/request.cgi b/mozilla/webtools/bugzilla/request.cgi
index 9383c210812..3057eebd660 100755
--- a/mozilla/webtools/bugzilla/request.cgi
+++ b/mozilla/webtools/bugzilla/request.cgi
@@ -31,7 +31,6 @@ use strict;
 use lib qw(.);
 
 use Bugzilla;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::Util;
 use Bugzilla::Error;
 use Bugzilla::Flag;
diff --git a/mozilla/webtools/bugzilla/show_bug.cgi b/mozilla/webtools/bugzilla/show_bug.cgi
index 9e322a75f79..a23621d78fd 100755
--- a/mozilla/webtools/bugzilla/show_bug.cgi
+++ b/mozilla/webtools/bugzilla/show_bug.cgi
@@ -26,7 +26,6 @@ use lib qw(.);
 
 use Bugzilla;
 use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::Error;
 use Bugzilla::User;
 use Bugzilla::Keyword;
diff --git a/mozilla/webtools/bugzilla/showdependencygraph.cgi b/mozilla/webtools/bugzilla/showdependencygraph.cgi
index 5b6c3195a1d..c797e2b125e 100755
--- a/mozilla/webtools/bugzilla/showdependencygraph.cgi
+++ b/mozilla/webtools/bugzilla/showdependencygraph.cgi
@@ -29,7 +29,6 @@ use File::Temp;
 
 use Bugzilla;
 use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::Util;
 use Bugzilla::Error;
 use Bugzilla::Bug;
diff --git a/mozilla/webtools/bugzilla/summarize_time.cgi b/mozilla/webtools/bugzilla/summarize_time.cgi
index 371e43f8142..7693c988a66 100755
--- a/mozilla/webtools/bugzilla/summarize_time.cgi
+++ b/mozilla/webtools/bugzilla/summarize_time.cgi
@@ -25,7 +25,6 @@ use Date::Format;        # strftime
 
 use Bugzilla;
 use Bugzilla::Constants; # LOGIN_*
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::Bug;       # EmitDependList
 use Bugzilla::Util;      # trim
 use Bugzilla::Error;
diff --git a/mozilla/webtools/bugzilla/userprefs.cgi b/mozilla/webtools/bugzilla/userprefs.cgi
index a07cff13513..5c1a85e329f 100755
--- a/mozilla/webtools/bugzilla/userprefs.cgi
+++ b/mozilla/webtools/bugzilla/userprefs.cgi
@@ -28,7 +28,6 @@ use lib qw(.);
 
 use Bugzilla;
 use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::Search;
 use Bugzilla::Util;
 use Bugzilla::Error;
diff --git a/mozilla/webtools/bugzilla/votes.cgi b/mozilla/webtools/bugzilla/votes.cgi
index bbae0b7cb01..7e72bfcd36b 100755
--- a/mozilla/webtools/bugzilla/votes.cgi
+++ b/mozilla/webtools/bugzilla/votes.cgi
@@ -29,7 +29,6 @@ use lib ".";
 
 use Bugzilla;
 use Bugzilla::Constants;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::Util;
 use Bugzilla::Error;
 use Bugzilla::Bug;
diff --git a/mozilla/webtools/bugzilla/whine.pl b/mozilla/webtools/bugzilla/whine.pl
index 093b6e5e607..8e60370a357 100755
--- a/mozilla/webtools/bugzilla/whine.pl
+++ b/mozilla/webtools/bugzilla/whine.pl
@@ -29,7 +29,6 @@ use strict;
 use lib ".";
 
 use Bugzilla;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::Constants;
 use Bugzilla::Search;
 use Bugzilla::User;
diff --git a/mozilla/webtools/bugzilla/whineatnews.pl b/mozilla/webtools/bugzilla/whineatnews.pl
index 3276858e7b3..58099076972 100755
--- a/mozilla/webtools/bugzilla/whineatnews.pl
+++ b/mozilla/webtools/bugzilla/whineatnews.pl
@@ -31,7 +31,6 @@ use strict;
 use lib '.';
 
 use Bugzilla;
-use Bugzilla::Config qw(:DEFAULT);
 use Bugzilla::Mailer;
 use Bugzilla::Util;