Re #8569. Fixing the linux/mac builds.