Merge upstream following delete.