- got rid of the NETWORK defines... they shouldn't be relevant any more
[[Split portion of a mixed commit.]]