CFY-1049 revert changes