Re #9891. Fixing the builds.