Upgrade to netty 4.0.18.Final and revert workaround which is not needed anymore now