add a TODO comment to properly fix 21902