Remove use of ModuleInfoBackedContext