    }
  }
  
-@@ -169,11 +126,10 @@ void TimerQueue::cancelInLoop(TimerId timerId)
+@@ -174,11 +129,10 @@ void TimerQueue::cancelInLoop(TimerId timerId)
    assert(timers_.size() == activeTimers_.size());
  }
  

   int sockfd = ::socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
   if (sockfd < 0)
   {
@@ -68,13 +78,6 @@ int sockets::createNonblockingOrDie()
   }
 
   setNonBlockAndCloseOnExec(sockfd);

   return sockfd;
 }
 
@@ -110,13 +113,8 @@ void sockets::listenOrDie(int sockfd)
 int sockets::accept(int sockfd, struct sockaddr_in* addr)
 {
   socklen_t addrlen = static_cast<socklen_t>(sizeof *addr);
-#if VALGRIND || defined (NO_ACCEPT4)
   int connfd = ::accept(sockfd, sockaddr_cast(addr), &addrlen);
   setNonBlockAndCloseOnExec(connfd);
-#else
