Revert "DEV: Topic tracking state improvements (#12958)" (PR #13209)

GitHub