Align to the most recent go-cider API