Revert "rolled back"

This reverts commit 41f9e7c58a331eb59ec30c480b80b9b0eaca5c76.
Revert "Added fix(?) for SPR-10440 test case"

This reverts commit 728803fa52f4f09ce9e5e927595be06d5fb75da7.