Reverse commit to bring core-netty back, use as a reference