diff --git a/BeastConfig.h b/BeastConfig.h
index f031c3b1e0..6e78266d04 100644
--- a/BeastConfig.h
+++ b/BeastConfig.h
@@ -163,7 +163,7 @@
 // in Peer code if you suspect you're having problems because of it.
 //
 #ifndef RIPPLE_PEER_USES_BEAST_MULTISOCKET
-#define RIPPLE_PEER_USES_BEAST_MULTISOCKET 0
+#define RIPPLE_PEER_USES_BEAST_MULTISOCKET 1
 #endif
 
 // Here temporarily to turn off new Validations code while it
diff --git a/modules/ripple_app/peers/ripple_Peer.cpp b/modules/ripple_app/peers/ripple_Peer.cpp
index 0c777516fb..0a2b3ef863 100644
--- a/modules/ripple_app/peers/ripple_Peer.cpp
+++ b/modules/ripple_app/peers/ripple_Peer.cpp
@@ -34,7 +34,8 @@ public:
 
 #if RIPPLE_PEER_USES_BEAST_MULTISOCKET
     ScopedPointer <MultiSocket> m_socket;
-    boost::asio::io_service& m_strand;
+    //boost::asio::io_service& m_strand;
+    boost::asio::io_service::strand m_strand;
 
     NativeSocketType& getNativeSocket ()
     {
diff --git a/modules/ripple_net/basics/impl/MultiSocketType.h b/modules/ripple_net/basics/impl/MultiSocketType.h
index ee26fd9202..31cf89e681 100644
--- a/modules/ripple_net/basics/impl/MultiSocketType.h
+++ b/modules/ripple_net/basics/impl/MultiSocketType.h
@@ -598,7 +598,7 @@ protected:
     Socket* new_ssl_stream ()
     {
         typedef typename boost::asio::ssl::stream <next_layer_type&> SslStream;
-        typedef SocketWrapperStrand <SslStream> Wrapper;
+        typedef SocketWrapper <SslStream> Wrapper;
         Wrapper* const socket = new Wrapper (m_next_layer, m_ssl_context);
         set_ssl_stream (socket->this_layer ());
         return socket;
@@ -614,7 +614,7 @@ protected:
         {
             typedef boost::asio::ssl::stream <
                 PrefilledReadStream <next_layer_type&> > SslStream;
-            typedef SocketWrapperStrand <SslStream> Wrapper;
+            typedef SocketWrapper <SslStream> Wrapper;
             Wrapper* const socket = new Wrapper (m_next_layer, m_ssl_context);
             socket->this_layer ().next_layer().fill (buffers);
             set_ssl_stream (socket->this_layer ());