Fixup previous merge.