Fix building with 2.065 git-head.