Fix missing variable post-rebase