[FIX] crm: Revert back change of Task ID-1796