diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/create_edit_field/create_edit_field.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/create_edit_field/create_edit_field.js
index c9ea1e12c58fd..5f0994abc11e4 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/create_edit_field/create_edit_field.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/create_edit_field/create_edit_field.js
@@ -17,9 +17,7 @@
  * under the License.
  */
 
-import { setup as data } from '../../../../../../../data/public/legacy';
-const { FieldImpl: Field } = data.indexPatterns.__LEGACY;
-
+import { Field } from '../../../../../../../../../plugins/data/public';
 import { RegistryFieldFormatEditorsProvider } from 'ui/registry/field_format_editors';
 import { docTitle } from 'ui/doc_title';
 import { KbnUrlProvider } from 'ui/url';
diff --git a/src/plugins/data/public/index_patterns/index_patterns_service.ts b/src/plugins/data/public/index_patterns/index_patterns_service.ts
index db69455fe0d3c..1a2382d6663b3 100644
--- a/src/plugins/data/public/index_patterns/index_patterns_service.ts
+++ b/src/plugins/data/public/index_patterns/index_patterns_service.ts
@@ -24,7 +24,7 @@ import {
   NotificationsStart,
 } from 'src/core/public';
 import { FieldFormatsStart } from '../field_formats_provider';
-import { Field, FieldList } from './fields';
+import { FieldList } from './fields';
 import { setNotifications, setFieldFormats } from './services';
 import { createFlattenHitWrapper, formatHitProvider, IndexPatterns } from './index_patterns';
 
@@ -49,11 +49,6 @@ export class IndexPatternsService {
       FieldList,
       flattenHitWrapper: createFlattenHitWrapper(),
       formatHitProvider,
-      __LEGACY: {
-        // For BWC we must temporarily export the class implementation of Field,
-        // which is only used externally by the Index Pattern UI.
-        FieldImpl: Field,
-      },
     };
     return this.setupApi;
   }