Switch to back-ported ContextDict