Fix rebase screwup.