Do not fallback to Ops proxy. Fixes #4208.
Merge pull request #4280 from HassenRiahi/DoNotFallbackToOpsProxy

Do not fallback to Ops proxy. Fixes #4208.