Brown paper bag fix for Varnish/upload/CORS

Change-Id: Ie121af2049c5f3b551598bd05065d7777416a619