Clean-up logic for overriding proxy #6786

Job	Run time
Packaging: Config file (ubuntu-latest, linked)	1m 13s
Packaging: Config file (macos-latest, linked)	1m 2s
Packaging: Config file (windows-latest, linked)	6m 28s
Packaging: Config file (windows-latest, nightly-latest)	8m 13s
Packaging: Config file (ubuntu-latest, default)	1m 0s
Packaging: Config file (macos-latest, nightly-latest)	1m 12s
Packaging: Config file (ubuntu-latest, nightly-latest)	1m 3s
Packaging: Config file (macos-latest, default)	1m 0s
Packaging: Config file (windows-latest, default)	3m 46s
	24m 57s

Provide feedback