diff --git a/tracker/issueentryafterlogin.py b/tracker/issueentryafterlogin.py
index 3008d54..f60cb71 100644
--- a/tracker/issueentryafterlogin.py
+++ b/tracker/issueentryafterlogin.py
@@ -1,7 +1,6 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file or at
-# https://developers.google.com/open-source/licenses/bsd
+# Copyright 2016 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
 
 """Redirect to /issues/entry or an external URL (like the wizard).
 """
@@ -11,7 +10,7 @@
 
 import logging
 
-from framework import flaskservlet
+from framework import exceptions
 from framework import servlet
 from framework import servlet_helpers
 
@@ -28,7 +27,8 @@
 
     entry_page_url = servlet_helpers.ComputeIssueEntryURL(mr)
     logging.info('Redirecting to %r', entry_page_url)
-    self.redirect(entry_page_url, abort=True)
 
-  # def GetIssueEntryAfterLogin(self, **kwargs):
-  #   return self.handler(**kwargs)
+    raise exceptions.RedirectException(entry_page_url)
+
+  def GetIssueEntryAfterLogin(self, **kwargs):
+    return self.handler(**kwargs)