Re #9199. Fixing the builds.