Re #8355. Fixing the builds.