This one-line fix is already in main, from #31862. but that PR relies on other refactor PRs, and all are too broad to apply to the patch release branch. Signed-off-by: Scott Rigby <scott@r6by.com>