Fixed mess-up with previous merge.