Revert r190921.  It broke Windows.

I'll roll it back in when I have a chance to look at it in detail.