chore(revert): partially revert commit related to CAM-3074