Fix up shitty merge.