The workaround would now cause build failures in Appveyor as seem to
have pre-emptively applied it to their environments.

I'm not too happy about their handling of the issue. Seems fiddly.

Anyway this commit is now required to build on Appveyor.