Merge pull request #12893 from JosJuice/revert-audit-get-state Revert "Audit uses of IsRunning and GetState"
