reverting accidental commit of my fix for #25008 - we'll let Tomas review the patch I submitted (oops).  The other stuff was good.
reverting accidental commit of my fix for #25008 - we'll let Tomas review the patch I submitted (oops).  The other stuff was good.


marcosptf/pear-core,marcosptf/pear-core,marcosptf/pear-core,marcosptf/pear-core,marcosptf/pear-core,marcosptf/pear-core