Revert "DEV: Improving topic tracking state code (#12555)" (PR #12864)

This reverts commit 45df579db05a133eaeb55693827a1ec7c2690b43.

GitHub