Re #8569. Fixing the linux builds.