Rewrite proxy URLs to normal URLs

Change-Id: I0463fe8222261dd0acb5a629c38a2c054b8f290e