SC-19 Revert 2989dc04c8c67d7eb66464eae2a1eba36862a6c0