Revert some Netty implementation updates and clean some other
Merge remote-tracking branch 'UMS/master'