Revert "Moving towards single variable handling for network distribution"

This reverts commit 988c1ae70b698e9ddb882dcb65eadfb8ca8fbfae.