diff --git a/pull/src/endpoint.cc b/pull/src/endpoint.cc
index 3e8ab3fb..bd98cef4 100644
--- a/pull/src/endpoint.cc
+++ b/pull/src/endpoint.cc
@@ -9,14 +9,6 @@
 namespace prometheus {
 namespace detail {
 
-namespace {
-class AlwaysAllowAccessHandler : public CivetAuthHandler {
-  bool authorize(CivetServer*, struct mg_connection*) override { return true; }
-};
-
-AlwaysAllowAccessHandler alwaysAllowAccessHandler;
-}  // namespace
-
 Endpoint::Endpoint(CivetServer& server, std::string uri)
     : server_(server),
       uri_(std::move(uri)),
@@ -30,9 +22,7 @@ Endpoint::Endpoint(CivetServer& server, std::string uri)
 Endpoint::~Endpoint() {
   server_.removeHandler(uri_);
   if (auth_handler_) {
-    // work-around https://github.com/civetweb/civetweb/issues/941
-    // server_.removeAuthHandler(uri_);
-    server_.addAuthHandler(uri_, alwaysAllowAccessHandler);
+    server_.removeAuthHandler(uri_);
   }
 }