--- a/pylib/mozreview/mozreview/middleware.py
+++ b/pylib/mozreview/mozreview/middleware.py
@@ -1,8 +1,10 @@
+from django.conf import settings
+
 from mozreview.models import get_profile, MozReviewUserProfile
 
 
 class MozReviewUserProfileMiddleware(object):
     """Fetch the MozReviewUserProfile and attach it to the request object."""
 
     def process_request(self, request):
         if not request.user.is_authenticated():
@@ -34,9 +36,18 @@ class MozReviewCacheDisableMiddleware(ob
 
     def process_response(self, request, response):
         if (request.resolver_match and
             request.resolver_match.url_name in self.URLNAME_BLACKLIST and
             'ETag' in response):
             # Clear the etag Review Board generated
             del response['ETag']
 
-        return response
\ No newline at end of file
+        return response
+
+
+class CorsHeaderMiddleware(object):
+    """Add a CORS header if running in debug mode."""
+
+    def process_response(self, request, response):
+        if settings.DEBUG:
+            response['Access-Control-Allow-Origin'] = '*'
+        return response

--- a/pylib/rbbz/rbbz/extension.py
+++ b/pylib/rbbz/rbbz/extension.py
@@ -21,25 +21,25 @@ from mozreview.bugzilla.errors import (
 )
 from mozreview.errors import (
     ParentShipItError,
 )
 from mozreview.extra_data import (
     is_parent,
     is_pushed,
 )
+from mozreview.middleware import CorsHeaderMiddleware
 from mozreview.models import (
     get_bugzilla_api_key,
 )
 from mozreview.rb_utils import (
     get_obj_url,
 )
 from rbbz.auth import BugzillaBackend
 from rbbz.diffs import build_plaintext_review
-from rbbz.middleware import CorsHeaderMiddleware
 from rbbz.resources import bugzilla_cookie_login_resource
 
 
 logger = logging.getLogger(__name__)
 
 
 class BugzillaExtension(Extension):
     middleware = [CorsHeaderMiddleware]

deleted file mode 100644
--- a/pylib/rbbz/rbbz/middleware.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-from django.conf import settings
-
-
-class CorsHeaderMiddleware(object):
-    """Add a CORS header if running in debug mode."""
-
-    def process_response(self, request, response):
-        if settings.DEBUG:
-            response['Access-Control-Allow-Origin'] = '*'
-        return response