diff --git a/p2p/client/basic_port_allocator.h b/p2p/client/basic_port_allocator.h
index 26b181807a..b27016a1dc 100644
--- a/p2p/client/basic_port_allocator.h
+++ b/p2p/client/basic_port_allocator.h
@@ -106,9 +106,8 @@ enum class SessionState {
               // process will be started.
 };
 
-class RTC_EXPORT BasicPortAllocatorSession
-    : public PortAllocatorSession,
-      public rtc::MessageHandlerAutoCleanup {
+class RTC_EXPORT BasicPortAllocatorSession : public PortAllocatorSession,
+                                             public rtc::MessageHandler {
  public:
   BasicPortAllocatorSession(BasicPortAllocator* allocator,
                             const std::string& content_name,
@@ -324,7 +323,7 @@ class TurnPort;
 
 // Performs the allocation of ports, in a sequenced (timed) manner, for a given
 // network and IP address.
-class AllocationSequence : public rtc::MessageHandlerAutoCleanup,
+class AllocationSequence : public rtc::MessageHandler,
                            public sigslot::has_slots<> {
  public:
   enum State {