Unbust non-Windows build.

Needs further investigation into what happens on other platforms.