Revert "fix for SPR23712"

This reverts commit f6ea29ac060e77a47587e17161a62009aa98504d.