working through proxy, context crap still there

Change-Id: I3d76fa21eb6d5064b811229b5d1d05565e67d23a