diff --git a/xmodule/modulestore/mongo/base.py b/xmodule/modulestore/mongo/base.py
index 869d45cd15..863d009555 100644
--- a/xmodule/modulestore/mongo/base.py
+++ b/xmodule/modulestore/mongo/base.py
@@ -204,7 +204,6 @@ class CachingDescriptorSystem(MakoDescriptorSystem, EditInfoRuntimeMixin):  # li
         kwargs.setdefault('id_reader', id_manager)
         kwargs.setdefault('id_generator', id_manager)
         super().__init__(
-            field_data=None,
             load_item=self.load_item,
             **kwargs
         )
diff --git a/xmodule/modulestore/split_mongo/caching_descriptor_system.py b/xmodule/modulestore/split_mongo/caching_descriptor_system.py
index 6849cc2c68..f951e5b000 100644
--- a/xmodule/modulestore/split_mongo/caching_descriptor_system.py
+++ b/xmodule/modulestore/split_mongo/caching_descriptor_system.py
@@ -60,7 +60,6 @@ class CachingDescriptorSystem(MakoDescriptorSystem, EditInfoRuntimeMixin):  # li
         kwargs.setdefault('id_generator', id_manager)
 
         super().__init__(
-            field_data=None,
             load_item=self._load_item,
             resources_fs=OSFS(root),
             **kwargs
diff --git a/xmodule/modulestore/xml.py b/xmodule/modulestore/xml.py
index 2b3e05fea8..0830281ba4 100644
--- a/xmodule/modulestore/xml.py
+++ b/xmodule/modulestore/xml.py
@@ -493,7 +493,9 @@ class XMLModuleStore(ModuleStoreReadBase):
                 """
                 return policy.get(policy_key(usage_id), {})
 
-            services = {}
+            services = {
+                'field-data': self.field_data
+            }
             if self.i18n_service:
                 services['i18n'] = self.i18n_service
 
@@ -513,7 +515,6 @@ class XMLModuleStore(ModuleStoreReadBase):
                 mixins=self.xblock_mixins,
                 default_class=self.default_class,
                 select=self.xblock_select,
-                field_data=self.field_data,
                 services=services,
                 target_course_id=target_course_id,
             )
diff --git a/xmodule/modulestore/xml_importer.py b/xmodule/modulestore/xml_importer.py
index 78e1901a55..d7824f5edd 100644
--- a/xmodule/modulestore/xml_importer.py
+++ b/xmodule/modulestore/xml_importer.py
@@ -954,7 +954,7 @@ def _import_course_draft(
         error_tracker=errorlog.tracker,
         load_error_modules=False,
         mixins=xml_module_store.xblock_mixins,
-        field_data=KvsFieldData(kvs=DictKeyValueStore()),
+        services={'field-data': KvsFieldData(kvs=DictKeyValueStore())},
         target_course_id=target_id,
     )
 
diff --git a/xmodule/tests/__init__.py b/xmodule/tests/__init__.py
index 6ab4105029..da533d484c 100644
--- a/xmodule/tests/__init__.py
+++ b/xmodule/tests/__init__.py
@@ -182,7 +182,6 @@ def get_test_descriptor_system(render_template=None):
         error_tracker=Mock(name='get_test_descriptor_system.error_tracker'),
         render_template=render_template or mock_render_template,
         mixins=(InheritanceMixin, XModuleMixin),
-        field_data=field_data,
         services={'field-data': field_data},
     )
     descriptor_system.get_asides = lambda block: []
diff --git a/xmodule/tests/test_course_module.py b/xmodule/tests/test_course_module.py
index 1e1657db57..4b0ed17df1 100644
--- a/xmodule/tests/test_course_module.py
+++ b/xmodule/tests/test_course_module.py
@@ -55,7 +55,7 @@ class DummySystem(ImportSystem):  # lint-amnesty, pylint: disable=abstract-metho
             course_dir=course_dir,
             error_tracker=error_tracker,
             load_error_modules=load_error_modules,
-            field_data=KvsFieldData(DictKeyValueStore()),
+            services={'field-data': KvsFieldData(DictKeyValueStore())},
         )
 
 
diff --git a/xmodule/tests/test_import.py b/xmodule/tests/test_import.py
index 0d33934b1e..ca151c3488 100644
--- a/xmodule/tests/test_import.py
+++ b/xmodule/tests/test_import.py
@@ -49,7 +49,7 @@ class DummySystem(ImportSystem):  # lint-amnesty, pylint: disable=abstract-metho
             error_tracker=error_tracker,
             load_error_modules=load_error_modules,
             mixins=(InheritanceMixin, XModuleMixin),
-            field_data=KvsFieldData(DictKeyValueStore()),
+            services={'field-data': KvsFieldData(DictKeyValueStore())},
         )
 
     def render_template(self, _template, _context):  # lint-amnesty, pylint: disable=method-hidden
diff --git a/xmodule/tests/xml/__init__.py b/xmodule/tests/xml/__init__.py
index 9918fc0d21..e915b0235b 100644
--- a/xmodule/tests/xml/__init__.py
+++ b/xmodule/tests/xml/__init__.py
@@ -38,7 +38,7 @@ class InMemorySystem(XMLParsingSystem, MakoDescriptorSystem):  # pylint: disable
             mixins=xml_import_data.xblock_mixins,
             select=xml_import_data.xblock_select,
             render_template=lambda template, context: pprint.pformat((template, context)),
-            field_data=KvsFieldData(DictKeyValueStore()),
+            services={'field-data': KvsFieldData(DictKeyValueStore())},
         )
 
     def process_xml(self, xml):  # pylint: disable=method-hidden