diff --git a/bootstrap.php b/bootstrap.php
index 9a66c5a071f74554a7c827fa17f8f279ea14dfb5..a82796ebd2d7ecba1eb453884502f10a193ded53 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -48,20 +48,6 @@ class Bootstrap {
             $_SERVER['REMOTE_ADDR'] = '';
     }
 
-    /*
-     * Glue to global signals  we're interested in
-     */
-    static function signals() {
-
-        //Clear upgrader session on logout.
-        Signal::connect('auth.logout', function ($user, $data=null) {
-                    if (!$user) return;
-
-                    if ($user instanceof Staff)
-                        $_SESSION['ost_upgrader'] = null;
-                });
-    }
-
     function https() {
        return
             (isset($_SERVER['HTTPS'])
diff --git a/main.inc.php b/main.inc.php
index 8c6d3d337f20c1196feca63c7dfb490479fad7a3..7feb271e7743274b02b2227ac29e68f4e67f3f7e 100644
--- a/main.inc.php
+++ b/main.inc.php
@@ -26,7 +26,6 @@ Bootstrap::defineTables(TABLE_PREFIX);
 Bootstrap::i18n_prep();
 Bootstrap::loadCode();
 Bootstrap::connect();
-Bootstrap::signals();
 
 if(!($ost=osTicket::start()) || !($cfg = $ost->getConfig()))
 Bootstrap::croak('Unable to load config info from DB. Get tech support.');
diff --git a/scp/logout.php b/scp/logout.php
index 0c78cd00e6afb8f1449442f060b5e66798850fe9..4cf519d35bc3a66597853f3a96f661190a245b33 100644
--- a/scp/logout.php
+++ b/scp/logout.php
@@ -15,11 +15,15 @@
     vim: expandtab sw=4 ts=4 sts=4:
 **********************************************************************/
 require('staff.inc.php');
+
 //Check token: Make sure the user actually clicked on the link to logout.
 if(!$_GET['auth'] || !$ost->validateLinkToken($_GET['auth']))
     @header('Location: index.php');
 
 $thisstaff->logOut();
+//Clear upgrader session on logout.
+$_SESSION['ost_upgrader'] = null;
+
 @header('Location: login.php');
 require('login.php');
 ?>