Agree. Will follow this PR with a more elegant networking & /etc/environment setup.

This works for now and we need to ship today.