Re #8911. Fixing the builds.