This also unbreaks the build with GCC 10. Changes: 43df775f24...2c1b27601a PR: 246700
43df775f24...2c1b27601a