fix building after migrating to git-r3