Seems like this was overlooked in PR #31142. See also issue #17082. (cherry picked from commit 4c3c73ef9c)
4c3c73ef9c