Revert "more network fixes"

This reverts commit f05743554b8e00723899646241ea1d12245ee6e4.