Revert "Merge branch 'feature/split-hide-network' into 'develop'"
This causes the entirety of User.Info to be clobbered.
This reverts merge request !733 (merged)
This causes the entirety of User.Info to be clobbered.
This reverts merge request !733 (merged)