Fix previous merge (again).