Reversing 2232df2de8bf57a0eb85333b337714d7b496840a

* Leaving netty upgraded to 3.6.0 though