Revert 6 tests failing on Win32 smoker.