Revert the string of attempted windows fixes to get back into a known good state for Linux/OSX.

Instead, use the smallest fix that has been reported to work.