Revert "Hack for "no network" bug"

This reverts commit 87eaeec5a9bf2a825de9cb45e0405e4b8bb5573c.
Hack for "no network" bug