(vfr) Fix merge error in 'Fix so we use TLS..' in a87e4307e872c59be2658737212f301759e5907d