Revert " networking features:"

This reverts commit cc63ddb707ee5c684ea026bc1136d7433ef61ada.
Revert "Tweaks for forward compatibility"

This reverts commit be5125b1341807ce014ed101ad46824bdf9737e2.