CI Failue

[simonjayhawkins]

i'll come back and edit the tittle and add a code sample

due to interaction of #25993 and #25983

[jreback]

I reverted the commit for: #25983, pls resubmit when you have a chance.