diff --git a/Bugzilla/Mailer.pm b/Bugzilla/Mailer.pm
index 03e859b4f..cf7c44430 100644
--- a/Bugzilla/Mailer.pm
+++ b/Bugzilla/Mailer.pm
@@ -151,6 +151,9 @@ sub MessageToMTA {
                     username => Bugzilla->params->{"smtp_username"},
                     password => Bugzilla->params->{"smtp_password"},
                     helo  => $hostname;
+        if (Bugzilla->params->{smtp_debug}) {
+            push @args, debug => 1;
+        }
     }
 
     Bugzilla::Hook::process('mailer_before_send',
diff --git a/HTTPServerSimple.pl b/HTTPServerSimple.pl
index 7645fe328..8d5e4e777 100755
--- a/HTTPServerSimple.pl
+++ b/HTTPServerSimple.pl
@@ -12,8 +12,6 @@ BEGIN
     ($dir) = $dir =~ /^(.*)$/s;
     chdir($dir);
     $Bugzilla::HTTPServerSimple::DOCROOT = $dir;
-    # Force everyone to use buffered input!
-    *CORE::GLOBAL::sysread = sub(*$$;$) { read $_[0], $_[1], $_[2], $_[3]; };
 }
 
 use lib qw(.);