Revert "Fix for #2544 in Netty 3.9"

This reverts commit 3532aab69999923a137eca70826bd2e955528a5b.