Berkfile got mangled in rebase