Revived the context creation code (again).