[Bug 43861] Build error in latest git master