Fix rebase/merge brain fart.