Did you sweep for unqualified uses of HTTPClient to make sure we're using the intended class everywhere?