[DF-1062]. Revert changes for defect.