Another fix from bad merge.