diff --git a/qa/pull-tester/rpc-tests.sh b/qa/pull-tester/rpc-tests.sh
index dbae3de14..5ff4752c0 100755
--- a/qa/pull-tester/rpc-tests.sh
+++ b/qa/pull-tester/rpc-tests.sh
@@ -86,6 +86,7 @@ testScripts=(
     'sapling_rewind_check.py'
     'feature_zip221.py'
     'upgrade_golden.py'
+    'post_heartwood_rollback.py'
 );
 testScriptsExt=(
     'getblocktemplate_longpoll.py'
diff --git a/qa/rpc-tests/post_heartwood_rollback.py b/qa/rpc-tests/post_heartwood_rollback.py
new file mode 100755
index 000000000..00b07801b
--- /dev/null
+++ b/qa/rpc-tests/post_heartwood_rollback.py
@@ -0,0 +1,120 @@
+#!/usr/bin/env python3
+# Copyright (c) 2019 The Zcash developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+'''
+Test rollbacks on post-Heartwood chains.
+'''
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import (
+    assert_equal,
+    bitcoind_processes,
+    connect_nodes_bi,
+    initialize_chain,
+    nuparams,
+    start_node,
+    start_nodes,
+    BLOSSOM_BRANCH_ID,
+    HEARTWOOD_BRANCH_ID,
+    NU4_BRANCH_ID,
+)
+
+import logging
+import time
+
+HAS_NU4 = [nuparams(BLOSSOM_BRANCH_ID, 205), nuparams(HEARTWOOD_BRANCH_ID, 210), nuparams(NU4_BRANCH_ID, 220), '-nurejectoldversions=false']
+NO_NU4 = [nuparams(BLOSSOM_BRANCH_ID, 205), nuparams(HEARTWOOD_BRANCH_ID, 210), '-nurejectoldversions=false']
+
+class PostHeartwoodRollbackTest (BitcoinTestFramework):
+
+    def setup_chain(self):
+        print("Initializing test directory "+self.options.tmpdir)
+        initialize_chain(self.options.tmpdir)
+
+    def setup_nodes(self):
+        return start_nodes(4, self.options.tmpdir, extra_args=[
+            HAS_NU4,
+            HAS_NU4,
+            NO_NU4,
+            NO_NU4
+        ])
+
+    def run_test (self):
+
+        # Generate shared state beyond Heartwood activation
+        print("Generating shared state beyond Heartwood activation")
+        logging.info("Generating initial blocks.")
+        self.nodes[0].generate(15)
+        self.sync_all()
+
+        # Split network at block 215 (after Heartwood, before NU4)
+        print("Splitting network at block 215 (after Heartwood, before NU4)")
+        self.split_network()
+
+        # Activate NU4 on node 0
+        print("Activating NU4 on node 0")
+        self.nodes[0].generate(5)
+        self.sync_all()
+
+        # Mine past NU4 activation height on node 2
+        print("Mining past NU4 activation height on node 2 ")
+        self.nodes[2].generate(20)
+        self.sync_all()
+
+        # print("nodes[0].getblockcount()", self.nodes[0].getblockcount())
+        # print("nodes[2].getblockcount()", self.nodes[2].getblockcount())
+
+        # for i in range (0,3,2):
+        #     blockcount = self.nodes[i].getblockcount()
+        #     for j in range (201,blockcount + 1):
+        #         print("\n before shutdown node: ", i, "block: ", j, "\n")
+        #         print(self.nodes[i].getblock(str(j)))
+
+        # Upgrade node 2 and 3 to NU4
+        print("Upgrading nodes 2 and 3 to NU4")
+        self.nodes[2].stop()
+        bitcoind_processes[2].wait()
+        self.nodes[2] = start_node(2, self.options.tmpdir, extra_args=HAS_NU4)
+
+        self.nodes[3].stop()
+        bitcoind_processes[3].wait()
+        self.nodes[3] = start_node(3, self.options.tmpdir, extra_args=HAS_NU4)
+
+        # for i in range (0,3,2):
+        #     blockcount = self.nodes[i].getblockcount()
+        #     for j in range (201,blockcount + 1):
+        #         print("\n after shutdown node: ", i, "block: ", j, "\n")
+        #         print(self.nodes[i].getblock(str(j)))
+
+        # Join network
+        print("Joining network")
+        # (if we used self.sync_all() here and there was a bug, the test would hang)
+        connect_nodes_bi(self.nodes,0,1)
+        connect_nodes_bi(self.nodes,0,2)
+        connect_nodes_bi(self.nodes,0,3)
+        connect_nodes_bi(self.nodes,1,2)
+        connect_nodes_bi(self.nodes,1,3)
+        connect_nodes_bi(self.nodes,2,3)
+
+        time.sleep(5)
+
+        # for i in range (0,3,2):
+        #     blockcount = self.nodes[i].getblockcount()
+        #     for j in range (201,blockcount + 1):
+        #         print("\n after sync node: ", i, "block: ", j, "\n")
+        #         print(self.nodes[i].getblock(str(j)))
+
+        node0_blockcount = self.nodes[0].getblockcount()
+        node2_blockcount = self.nodes[2].getblockcount()
+
+        assert_equal(node0_blockcount, node2_blockcount, "node 0 blockcount: " + str(node0_blockcount) + "node 2 blockcount: " + str(node2_blockcount))
+
+        node0_bestblockhash = self.nodes[0].getbestblockhash()
+        node2_bestblockhash = self.nodes[2].getbestblockhash()
+
+        assert_equal(node0_bestblockhash, node2_bestblockhash, "node 0 bestblockhash: " + str(node0_bestblockhash) + "node 2 bestblockhash: " + str(node2_blockcount))
+
+if __name__ == '__main__':
+    PostHeartwoodRollbackTest().main()
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index 9b50482d6..f97755e58 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2461,7 +2461,9 @@ static DisconnectResult DisconnectBlock(const CBlock& block, CValidationState& s
         view.PopAnchor(SaplingMerkleTree::empty_root(), SAPLING);
     }
 
-    auto consensusBranchId = CurrentEpochBranchId(pindex->nHeight, chainparams.GetConsensus());
+    // This is guaranteed to be filled by LoadBlockIndex.
+    assert(pindex->nCachedBranchId);
+    auto consensusBranchId = pindex->nCachedBranchId.get();
 
     if (chainparams.GetConsensus().NetworkUpgradeActive(pindex->nHeight, Consensus::UPGRADE_HEARTWOOD)) {
         view.PopHistoryNode(consensusBranchId);