diff --git a/src/interfaces/chain.cpp b/src/interfaces/chain.cpp
--- a/src/interfaces/chain.cpp
+++ b/src/interfaces/chain.cpp
@@ -417,17 +417,7 @@
             return !::fImporting && !::fReindex && !isInitialBlockDownload();
         }
         bool isInitialBlockDownload() override {
-            const CChainState *active_chainstate;
-            {
-                // TODO: Temporary scope to check correctness of refactored code
-                // Should be removed manually after backport of
-                // https://github.com/bitcoin/bitcoin/pull/20158
-                LOCK(::cs_main);
-                active_chainstate = &chainman().ActiveChainstate();
-                assert(std::addressof(::ChainstateActive()) ==
-                       std::addressof(*active_chainstate));
-            }
-            return active_chainstate->IsInitialBlockDownload();
+            return chainman().ActiveChainstate().IsInitialBlockDownload();
         }
         bool shutdownRequested() override { return ShutdownRequested(); }
         int64_t getAdjustedTime() override { return GetAdjustedTime(); }
diff --git a/src/interfaces/node.cpp b/src/interfaces/node.cpp
--- a/src/interfaces/node.cpp
+++ b/src/interfaces/node.cpp
@@ -192,16 +192,8 @@
             return chainman().ActiveChain().Height();
         }
         BlockHash getBestBlockHash() override {
-            const CBlockIndex *tip;
-            {
-                // TODO: Temporary scope to check correctness of refactored
-                // code. Should be removed manually after backport of
-                // https://github.com/bitcoin/bitcoin/pull/20158
-                LOCK(cs_main);
-                assert(std::addressof(::ChainActive()) ==
-                       std::addressof(chainman().ActiveChain()));
-                tip = chainman().ActiveChain().Tip();
-            }
+            const CBlockIndex *tip =
+                WITH_LOCK(::cs_main, return chainman().ActiveTip());
             return tip ? tip->GetBlockHash()
                        : Params().GenesisBlock().GetHash();
         }
@@ -226,17 +218,7 @@
             return GuessVerificationProgress(Params().TxData(), tip);
         }
         bool isInitialBlockDownload() override {
-            const CChainState *active_chainstate;
-            {
-                // TODO: Temporary scope to check correctness of refactored
-                // code. Should be removed manually after backport of
-                // https://github.com/bitcoin/bitcoin/pull/20158
-                LOCK(::cs_main);
-                active_chainstate = &m_context->chainman->ActiveChainstate();
-                assert(std::addressof(::ChainstateActive()) ==
-                       std::addressof(*active_chainstate));
-            }
-            return active_chainstate->IsInitialBlockDownload();
+            return chainman().ActiveChainstate().IsInitialBlockDownload();
         }
         bool getReindex() override { return ::fReindex; }
         bool getImporting() override { return ::fImporting; }