MDL-24650 fixing sloppy regression, sorry; credit for goes to Daniele Cordella