Make HttpClientFactory static because it's rather difficult to pass through to where it's used otherwise. See issue 432.
Undo accidental check-in. Issue 432.