Add SPR-12165
Revert "Add SPR-12165"

This reverts commit 45157f3674217d9d6900f89b6706d5f198d88cbc.
Add SPR-12165