Fix TODO entry from 2019 (#21889)