Futile attempts to get windows working

At this point I should probably admit that sitting down and thinking this through would be the best approach to things. Instead, here's another quick fix. --windows flag remains gone. It shouldn't be required