Omgomg found another place where I borked a rebase, PAH.