Issue 2658

Transferring @Scottmitch's personal pull request to @akamai's fork for https://github.com/netty/netty/pull/2695