Re #6518. Trying to fix the windoze build.