Fix previous merge.