Revert r32528, was not tested on Windows