reset to workable revision on network spawning
merged
Merge branch 'jwang' into precommit