Restore compatibility with upstream networking patch
Merge pull request #283 from ares/master

Restore compatibility with upstream networking patch