Revert "SSP-1675"

This reverts commit c9d50594f1ad087230046809e0dfdc200d4882fd.