From 2d15c8327cb41addaf5db5b7e47d49446e2bf2ea Mon Sep 17 00:00:00 2001
From: Michael Sandstedt <michael.sandstedt@smartthings.com>
Date: Wed, 29 Dec 2021 18:50:36 -0600
Subject: [PATCH] revert #13227 workarounds

---
 src/commissioner/Discoverer.h | 3 ---
 src/commissioner/States.h     | 3 ---
 src/lib/dnssd/ResolverProxy.h | 2 --
 3 files changed, 8 deletions(-)

diff --git a/src/commissioner/Discoverer.h b/src/commissioner/Discoverer.h
index f537a1e6c55d05..07623a9f859868 100644
--- a/src/commissioner/Discoverer.h
+++ b/src/commissioner/Discoverer.h
@@ -137,9 +137,6 @@ struct CommissionableIpNodeDiscoverer : chip::Controller::AbstractDnssdDiscovery
     {}
     ~CommissionableIpNodeDiscoverer()
     {
-        // TODO: We have to retain the proxy.  Due to #13227, mDNS can keep
-        //       referencing this.
-        mDNSResolver.GetDelegateProxy()->Retain();
         mDNSResolver.Shutdown();
     }
 
diff --git a/src/commissioner/States.h b/src/commissioner/States.h
index 606ed0222e9ead..e76c8a668dd7c0 100644
--- a/src/commissioner/States.h
+++ b/src/commissioner/States.h
@@ -671,9 +671,6 @@ struct OperationalDiscovery : Base<TContext>, chip::Dnssd::ResolverDelegate
 
     void Exit()
     {
-        // TODO: We have to retain the proxy.  Due to #13227, mDNS can keep
-        //       referencing this.
-        mDnsResolver.GetDelegateProxy()->Retain();
         mDnsResolver.Shutdown();
     }
 
diff --git a/src/lib/dnssd/ResolverProxy.h b/src/lib/dnssd/ResolverProxy.h
index 7bea388df87b24..43c7184218559e 100644
--- a/src/lib/dnssd/ResolverProxy.h
+++ b/src/lib/dnssd/ResolverProxy.h
@@ -90,8 +90,6 @@ class ResolverProxy : public Resolver
     CHIP_ERROR FindCommissionableNodes(DiscoveryFilter filter = DiscoveryFilter()) override;
     CHIP_ERROR FindCommissioners(DiscoveryFilter filter = DiscoveryFilter()) override;
 
-    ResolverDelegateProxy * GetDelegateProxy() { return mDelegate; };
-
 private:
     ResolverDelegateProxy * mDelegate = nullptr;
 };