SC-19 Revert 44060c2dc90862f172da34cd11aa9151e4e48723