diff --git a/examples/peerconnection/client/main.cc b/examples/peerconnection/client/main.cc
index cc8bdfbd76..e209171116 100644
--- a/examples/peerconnection/client/main.cc
+++ b/examples/peerconnection/client/main.cc
@@ -27,7 +27,6 @@
 #include "rtc_base/ssl_adapter.h"
 #include "rtc_base/string_utils.h"  // For ToUtf8
 #include "rtc_base/win32_socket_init.h"
-#include "rtc_base/win32_socket_server.h"
 #include "system_wrappers/include/field_trial.h"
 #include "test/field_trial.h"
 
@@ -76,9 +75,8 @@ int PASCAL wWinMain(HINSTANCE instance,
                     wchar_t* cmd_line,
                     int cmd_show) {
   rtc::WinsockInitializer winsock_init;
-  rtc::Win32SocketServer w32_ss;
-  rtc::Win32Thread w32_thread(&w32_ss);
-  rtc::ThreadManager::Instance()->SetCurrentThread(&w32_thread);
+  rtc::PhysicalSocketServer ss;
+  rtc::AutoSocketServerThread main_thread(&ss);
 
   WindowsCommandLineArguments win_args;
   int argc = win_args.argc();