Fix mis-merge.