More work to fix #29720. --------- Co-authored-by: Noah Talerman <47070608+noahtalerman@users.noreply.github.com>