diff --git a/include/maxscale/limits.h b/include/maxscale/limits.h
index 89eff4c3a..3f7248e46 100644
--- a/include/maxscale/limits.h
+++ b/include/maxscale/limits.h
@@ -22,21 +22,6 @@
 
 MXS_BEGIN_DECLS
 
-
-/**
- * MXS_SO_RCVBUF
- *
- * The size of the network input buffer.
- */
-#define MXS_SO_RCVBUF_SIZE (128 * 1024)
-
-/**
- * MXS_SO_SNDBUF
- *
- * The size of the network output buffer.
- */
-#define MXS_SO_SNDBUF_SIZE (128 * 1024)
-
 /**
  * MXS_MAX_THREADS
  *
diff --git a/server/core/dcb.cc b/server/core/dcb.cc
index 4eeaba481..53d249206 100644
--- a/server/core/dcb.cc
+++ b/server/core/dcb.cc
@@ -742,6 +742,7 @@ static int dcb_read_SSL(DCB* dcb, GWBUF** head)
  */
 static GWBUF* dcb_basic_read_SSL(DCB* dcb, int* nsingleread)
 {
+    const size_t MXS_SO_RCVBUF_SIZE = (128 * 1024);
     unsigned char temp_buffer[MXS_SO_RCVBUF_SIZE];
     GWBUF* buffer = NULL;
 
diff --git a/server/core/utils.cc b/server/core/utils.cc
index ce7d4c7eb..6b456aeb3 100644
--- a/server/core/utils.cc
+++ b/server/core/utils.cc
@@ -945,13 +945,9 @@ void utils_end()
 
 bool configure_network_socket(int so, int type)
 {
-    int sndbufsize = MXS_SO_SNDBUF_SIZE;
-    int rcvbufsize = MXS_SO_RCVBUF_SIZE;
     int one = 1;
 
-    if (setsockopt(so, SOL_SOCKET, SO_SNDBUF, &sndbufsize, sizeof(sndbufsize)) != 0
-        || setsockopt(so, SOL_SOCKET, SO_RCVBUF, &rcvbufsize, sizeof(rcvbufsize)) != 0
-        || (type != AF_UNIX && setsockopt(so, IPPROTO_TCP, TCP_NODELAY, &one, sizeof(one)) != 0))
+    if (type != AF_UNIX && setsockopt(so, IPPROTO_TCP, TCP_NODELAY, &one, sizeof(one)) != 0)
     {
         MXS_ERROR("Failed to set socket option: %d, %s.", errno, mxs_strerror(errno));
         mxb_assert(!true);