Fix network bug introduced in my original refactoring
Merge remote-tracking branch 'origin/master' into test