Currently we only remove the URL, which may leave a stale token. Change-Id: I9ff2d726cb75317fe09bd43342541db0e721f2b8