diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index 9162c3e1cf8..9a344ee042d 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-8980
\ No newline at end of file
+8981
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/.gitrev b/mozilla/webtools/bugzilla/.gitrev
index b0195ec59e8..a472609759b 100644
--- a/mozilla/webtools/bugzilla/.gitrev
+++ b/mozilla/webtools/bugzilla/.gitrev
@@ -1 +1 @@
-32931bb0370328c142e9d63f410d94f9db3c764d
\ No newline at end of file
+db8d9946f92f847a26bca5eb45f31ecaf7f031dd
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Auth/Login.pm b/mozilla/webtools/bugzilla/Bugzilla/Auth/Login.pm
index ddc1726894b..33d63a425cd 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Auth/Login.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Auth/Login.pm
@@ -9,7 +9,7 @@ package Bugzilla::Auth::Login;
 
 use 5.10.1;
 use strict;
-use fields qw(_login_token);
+use fields qw();
 
 # Determines whether or not a user can logout. It's really a subroutine,
 # but we implement it here as a constant. Override it in subclasses if
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/Cookie.pm b/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/Cookie.pm
index d2f9e2f1ea5..29e2310a0a0 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/Cookie.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/Cookie.pm
@@ -10,7 +10,8 @@ package Bugzilla::Auth::Login::Cookie;
 use 5.10.1;
 use strict;
 
-use parent qw(Bugzilla::Auth::Login);
+use base qw(Bugzilla::Auth::Login);
+use fields qw(_login_token);
 
 use Bugzilla::Constants;
 use Bugzilla::Util;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Auth/Persist/Cookie.pm b/mozilla/webtools/bugzilla/Bugzilla/Auth/Persist/Cookie.pm
index 939a1ac9c5c..5a9857cbaeb 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Auth/Persist/Cookie.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Auth/Persist/Cookie.pm
@@ -15,8 +15,6 @@ use Bugzilla::Constants;
 use Bugzilla::Util;
 use Bugzilla::Token;
 
-use Bugzilla::Auth::Login::Cookie qw(login_token);
-
 use List::Util qw(first);
 
 sub new {