Merge branch 'main' into avm99963-monorail

Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266

GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/sitewide/userclearbouncing.py b/sitewide/userclearbouncing.py
index 0ae5f4a..bdfe86e 100644
--- a/sitewide/userclearbouncing.py
+++ b/sitewide/userclearbouncing.py
@@ -1,18 +1,15 @@
-# 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.
 
 """Class to show a servlet to clear a user's bouncing email timestamp."""
 from __future__ import print_function
 from __future__ import division
 from __future__ import absolute_import
 
-import logging
 import time
 
 from framework import framework_helpers
-from framework import flaskservlet
 from framework import permissions
 from framework import servlet
 from framework import timestr
@@ -62,8 +59,8 @@
         mr, mr.viewed_user_auth.user_view.profile_url, include_project=False,
         saved=1, ts=int(time.time()))
 
-  # def GetUserClearBouncingPage(self, **kwargs):
-  #   return self.handler(**kwargs)
+  def GetUserClearBouncingPage(self, **kwargs):
+    return self.handler(**kwargs)
 
-  # def PostUserClearBouncingPage(self, **kwargs):
-  #   return self.handler(**kwargs)
+  def PostUserClearBouncingPage(self, **kwargs):
+    return self.handler(**kwargs)