Revert "Experimentally turning off some accounting to check performance impact."

This reverts commit 5972fd4f1d4f0f9461f80bb50aa1afa288b40f7a.