CDEC-20 : Revert same changes.