More breakage from failed rebase