diff --git a/features/notify.py b/features/notify.py
index 230cbf5..1217004 100644
--- a/features/notify.py
+++ b/features/notify.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.
 
 """Task handlers for email notifications of issue changes.
 
@@ -44,7 +43,7 @@
 from tracker import tracker_bizobj
 from tracker import tracker_helpers
 from tracker import tracker_views
-from proto import tracker_pb2
+from mrproto import tracker_pb2
 
 
 class NotifyIssueChangeTask(notify_helpers.NotifyTaskBase):
@@ -983,7 +982,7 @@
     return self.handler(**kwargs)
 
 
-class OutboundEmailTask(jsonfeed.FlaskInternalTask):
+class OutboundEmailTask(jsonfeed.InternalTask):
   """JSON servlet that sends one email.
 
   Handles tasks enqueued from notify_helpers._EnqueueOutboundEmail.