Regression from #24145, which was missed in #28146. (cherry picked from commit 071ebb1e48)
071ebb1e48