Update Netty version and remove our workaround - if this breaks, @mibby keeps the pieces.