Clean-up logic for overriding proxy #6785

Job	Run time
Packaging: Config file (ubuntu-latest, default)	59s
Packaging: Config file (macos-latest, linked)	58s
Packaging: Config file (ubuntu-latest, linked)	59s
Packaging: Config file (windows-latest, linked)	6m 12s
Packaging: Config file (windows-latest, default)	6m 11s
Packaging: Config file (macos-latest, default)	1m 0s
Packaging: Config file (ubuntu-latest, nightly-latest)	1m 5s
Packaging: Config file (windows-latest, nightly-latest)	6m 11s
Packaging: Config file (macos-latest, nightly-latest)	1m 1s
	24m 36s

Provide feedback