Backed out changeset 7441f4dde492 (bug 1038465) for hitting the network during tests.