Readd previous Netty tweaks, the memory leak has been fixed