CFY-1798 revert types yaml to spec