Merge branch 'main' into avm99963-monorail

Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266

GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/sitewide/custom_404.py b/sitewide/custom_404.py
index 557d1ff..62b9c1f 100644
--- a/sitewide/custom_404.py
+++ b/sitewide/custom_404.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.
 
 """Page class for generating somewhat informative project-page 404s.
 
@@ -17,7 +16,6 @@
 
 from six.moves import http_client
 from framework import exceptions
-from framework import flaskservlet
 from framework import servlet
 
 
@@ -41,5 +39,5 @@
         'http_response_code': http_client.NOT_FOUND,
     }
 
-  # def Get404Page(self, **kwargs):
-  #   return self.handler(**kwargs)
+  def Get404Page(self, **kwargs):
+    return self.handler(**kwargs)