RAZ-2968: Reverted it back