Cleanup of fix for #22232