Revert "Merge branch '29534-todos-performance' into 'master'"

Closes #29758

See merge request !10116