Fix API interface from bad merge.