Actually please make a commit without tests, I'll add this patch to the PR for #22424.