Revert "Readd previous Netty tweaks, the memory leak has been fixed"

This reverts commit d7ccd34e50c68bcb0a6924a33452bb8badcb42ac.