Merge "Reapply fix for the git version header"