diff --git a/libtransmission/handshake.c b/libtransmission/handshake.c
index ee08093dc..68036337a 100644
--- a/libtransmission/handshake.c
+++ b/libtransmission/handshake.c
@@ -1179,6 +1179,9 @@ tr_handshakeNew( tr_peerIo *        io,
 {
     tr_handshake * handshake;
 
+    tr_peerIoSetBandwidth( io, TR_UP, NULL );
+    tr_peerIoSetBandwidth( io, TR_DOWN, NULL );
+
     handshake = tr_new0( tr_handshake, 1 );
     handshake->io = io;
     handshake->crypto = tr_peerIoGetCrypto( io );
diff --git a/libtransmission/net.c b/libtransmission/net.c
index 4eb551557..ba40a250a 100644
--- a/libtransmission/net.c
+++ b/libtransmission/net.c
@@ -125,6 +125,7 @@ createSocket( int type )
 static void
 setSndBuf( tr_session * session, int fd )
 {
+#if 0
     if( fd >= 0 )
     {
         const int sndbuf = session->so_sndbuf;
@@ -132,6 +133,7 @@ setSndBuf( tr_session * session, int fd )
         setsockopt( fd, SOL_SOCKET, SO_SNDBUF, &sndbuf, sizeof( sndbuf ) );
         setsockopt( fd, SOL_SOCKET, SO_RCVBUF, &rcvbuf, sizeof( rcvbuf ) );
     }
+#endif
 }
 
 int