Re #6846. Trying to fix the windoze builds.