Re #940 - API needs web context now