Remove failed https forwarding fix

Using a different workaround.

Change-Id: Ie572a7e9d1bf3a4f5e4d569b42ab856e625d3019