Fix failing test caused by a bad merge.