SOS-1599 fix revert