reverting back to not using context_instance