diff --git a/packages/base/card-api.gts b/packages/base/card-api.gts
index 548ba71d4b..ad4c791d11 100644
--- a/packages/base/card-api.gts
+++ b/packages/base/card-api.gts
@@ -323,16 +323,6 @@ interface Options {
   isUsed?: true;
   // Optional: per-usage configuration provider merged with FieldDef-level configuration
   configuration?: ConfigurationInput<any>;
-  // Optional: per-usage edit component that overrides the FieldDef's
-  // `static edit` for this specific field declaration. Lets a parent
-  // card customize the editor for one of its fields without having
-  // to subclass the FieldDef or replace its own `static edit`.
-  // ComponentLike<any> rather than BaseDefComponent so that wrap-style
-  // overrides on collection fields (containsMany / linksToMany) can
-  // declare their own Args shape — e.g. accepting `@values` and
-  // `@defaultEditor`. The runtime contract per field type is documented
-  // at the rendering sites.
-  edit?: ComponentLike<any>;
 }
 
 interface RelationshipOptions extends Options {
@@ -555,15 +545,6 @@ export interface Field<
   computeVia: undefined | (() => unknown);
   // Optional per-usage configuration stored on the field descriptor
   configuration?: ConfigurationInput<any>;
-  // Optional per-usage edit component override — when set, the field
-  // renders with this Component in edit format instead of the
-  // FieldDef's `static edit`.
-  // ComponentLike<any> rather than BaseDefComponent so that wrap-style
-  // overrides on collection fields (containsMany / linksToMany) can
-  // declare their own Args shape — e.g. accepting `@values` and
-  // `@defaultEditor`. The runtime contract per field type is documented
-  // at the rendering sites.
-  edit?: ComponentLike<any>;
   // Declarative relationship query definition, if provided
   queryDefinition?: QueryWithInterpolations;
   captureQueryFieldSeedData?(
@@ -649,7 +630,6 @@ class ContainsMany<FieldT extends FieldDefConstructor> implements Field<
   readonly computeVia: undefined | (() => unknown);
   readonly name: string;
   readonly description: string | undefined;
-  readonly edit?: ComponentLike<any>;
   readonly isUsed: undefined | true;
   readonly isPolymorphic: undefined | true;
   configuration: ConfigurationInput<any> | undefined;
@@ -977,7 +957,6 @@ class Contains<CardT extends FieldDefConstructor> implements Field<CardT, any> {
   readonly computeVia: undefined | (() => unknown);
   readonly name: string;
   readonly description: string | undefined;
-  readonly edit?: ComponentLike<any>;
   readonly isUsed: undefined | true;
   readonly isPolymorphic: undefined | true;
   configuration: ConfigurationInput<any> | undefined;
@@ -1206,7 +1185,6 @@ class LinksTo<CardT extends LinkableDefConstructor> implements Field<CardT> {
   readonly computeVia: undefined | (() => unknown);
   readonly name: string;
   readonly description: string | undefined;
-  readonly edit?: ComponentLike<any>;
   readonly isUsed: undefined | true;
   readonly isPolymorphic: undefined | true;
   readonly configuration?: ConfigurationInput<any>;
@@ -1599,25 +1577,14 @@ class LinksTo<CardT extends LinkableDefConstructor> implements Field<CardT> {
               {{#if
                 (shouldRenderEditor @format defaultFormats.cardDef isComputed)
               }}
-                {{#if linksToField.edit}}
-                  <linksToField.edit
-                    @model={{(getInnerModel)}}
-                    @field={{linksToField}}
-                    @brokenLink={{broken}}
-                    @typeConstraint={{@typeConstraint}}
-                    @createCard={{cardCrudFunctions.createCard}}
-                    ...attributes
-                  />
-                {{else}}
-                  <LinksToEditor
-                    @model={{(getInnerModel)}}
-                    @field={{linksToField}}
-                    @brokenLink={{broken}}
-                    @typeConstraint={{@typeConstraint}}
-                    @createCard={{cardCrudFunctions.createCard}}
-                    ...attributes
-                  />
-                {{/if}}
+                <LinksToEditor
+                  @model={{(getInnerModel)}}
+                  @field={{linksToField}}
+                  @brokenLink={{broken}}
+                  @typeConstraint={{@typeConstraint}}
+                  @createCard={{cardCrudFunctions.createCard}}
+                  ...attributes
+                />
               {{else if broken}}
                 <BrokenLinkTemplate
                   @brokenUrl={{broken.reference}}
@@ -2331,7 +2298,6 @@ export function containsMany<FieldT extends FieldDefConstructor>(
         isUsed,
       });
       (instance as any).configuration = options?.configuration;
-      (instance as any).edit = options?.edit;
       return makeDescriptor(instance);
     },
     description: options?.description,
@@ -2352,7 +2318,6 @@ export function contains<FieldT extends FieldDefConstructor>(
         isUsed,
       });
       (instance as any).configuration = options?.configuration;
-      (instance as any).edit = options?.edit;
       return makeDescriptor(instance);
     },
     description: options?.description,
@@ -2379,7 +2344,6 @@ export function linksTo<CardT extends LinkableDefConstructor>(
         queryDefinition: query,
       });
       (instance as any).configuration = options?.configuration;
-      (instance as any).edit = options?.edit;
       return makeDescriptor(instance);
     },
     description: options?.description,
@@ -2406,7 +2370,6 @@ export function linksToMany<CardT extends LinkableDefConstructor>(
         queryDefinition: query,
       });
       (instance as any).configuration = options?.configuration;
-      (instance as any).edit = options?.edit;
       return makeDescriptor(instance);
     },
     description: options?.description,
diff --git a/packages/base/contains-many-component.gts b/packages/base/contains-many-component.gts
index 37196f34a5..14a5b336af 100644
--- a/packages/base/contains-many-component.gts
+++ b/packages/base/contains-many-component.gts
@@ -353,36 +353,13 @@ export function getContainsManyComponent({
       <DefaultFormatsConsumer as |defaultFormats|>
         {{setOverrides model.value}}
         {{#if (shouldRenderEditor @format defaultFormats.fieldDef isComputed)}}
-          {{#if field.edit}}
-            {{!-- Per-usage edit override on a containsMany.
-                  Contract: the override receives the containing card as
-                  @model, the current values array as @values, and a
-                  pre-bound default ContainsManyEditor as @defaultEditor
-                  so it can wrap (e.g. render a banner above) the standard
-                  iteration + add/remove/sortable UI without
-                  reimplementing it. --}}
-            <field.edit
-              @model={{model.value}}
-              @values={{arrayField.value}}
-              @defaultEditor={{component
-                ContainsManyEditor
-                model=model
-                arrayField=arrayField
-                field=field
-                cardTypeFor=cardTypeFor
-                typeConstraint=@typeConstraint
-              }}
-              ...attributes
-            />
-          {{else}}
-            <ContainsManyEditor
-              @model={{model}}
-              @arrayField={{arrayField}}
-              @field={{field}}
-              @cardTypeFor={{cardTypeFor}}
-              @typeConstraint={{@typeConstraint}}
-            />
-          {{/if}}
+          <ContainsManyEditor
+            @model={{model}}
+            @arrayField={{arrayField}}
+            @field={{field}}
+            @cardTypeFor={{cardTypeFor}}
+            @typeConstraint={{@typeConstraint}}
+          />
         {{else}}
           {{#let
             (coalesce @format defaultFormats.fieldDef)
diff --git a/packages/base/field-component.gts b/packages/base/field-component.gts
index 672212fcfe..feb40ded31 100644
--- a/packages/base/field-component.gts
+++ b/packages/base/field-component.gts
@@ -234,28 +234,9 @@ export function getBoxComponent(
     ) {
       viewSlot = 'embedded';
     }
-    // Per-usage `edit` override on an atomic field wins over the
-    // FieldDef's `static edit`. Restricted to `contains` / `linksTo`
-    // here — collection fields (`containsMany` / `linksToMany`) carry
-    // their own override path in their component files, where the
-    // wrap-style contract can pass `@defaultEditor`. Without this
-    // gate the collection's field descriptor would also reach each
-    // iterated item and replace its template, blanking the item rows.
-    // The per-usage override expresses stronger intent than the
-    // view-slot dedup above: if the consumer explicitly supplied
-    // `edit:`, they asked for a different component in edit format,
-    // so it must win even when the FieldDef aliases its embedded /
-    // isolated slot to the same reference as its `static edit`.
-    // (Toggling embedded↔edit will remount as a result — that's
-    // correct; the consumer opted into a different component.)
-    let isAtomicFieldType =
-      field?.fieldType === 'contains' || field?.fieldType === 'linksTo';
-    let CardOrFieldFormatComponent: BaseDefComponent =
-      effectiveFormat === 'edit' && isAtomicFieldType && field?.edit
-        ? field.edit
-        : viewSlot
-          ? componentClass[viewSlot]
-          : componentClass[effectiveFormat];
+    let CardOrFieldFormatComponent: BaseDefComponent = viewSlot
+      ? componentClass[viewSlot]
+      : componentClass[effectiveFormat];
     return {
       CardOrFieldFormatComponent,
       fields,
diff --git a/packages/base/links-to-many-component.gts b/packages/base/links-to-many-component.gts
index f1bd6b2502..721c78d589 100644
--- a/packages/base/links-to-many-component.gts
+++ b/packages/base/links-to-many-component.gts
@@ -658,46 +658,19 @@ export function getLinksToManyComponent({
     <template>
       <DefaultFormatsConsumer as |defaultFormats|>
         {{#if (shouldRenderEditor @format defaultFormats.cardDef isComputed)}}
-          {{#if field.edit}}
-            {{!-- Per-usage edit override on a linksToMany. Contract
-                  mirrors containsMany: the override receives the
-                  containing card as @model, the current values array
-                  as @values, and a pre-bound default LinksToManyEditor
-                  as @defaultEditor so it can wrap the standard iteration
-                  / add / remove UI without reimplementing it. --}}
-            <field.edit
-              @model={{model.value}}
-              @values={{arrayField.value}}
-              @defaultEditor={{component
-                LinksToManyEditor
-                model=model
-                arrayField=arrayField
-                field=field
-                cardTypeFor=cardTypeFor
-                childFormat=(getEditorChildFormat
-                  @format
-                  defaultFormats.cardDef
-                  model
-                )
-                typeConstraint=@typeConstraint
-              }}
-              ...attributes
-            />
-          {{else}}
-            <LinksToManyEditor
-              @model={{model}}
-              @arrayField={{arrayField}}
-              @field={{field}}
-              @cardTypeFor={{cardTypeFor}}
-              @childFormat={{getEditorChildFormat
-                @format
-                defaultFormats.cardDef
-                model
-              }}
-              @typeConstraint={{@typeConstraint}}
-              ...attributes
-            />
-          {{/if}}
+          <LinksToManyEditor
+            @model={{model}}
+            @arrayField={{arrayField}}
+            @field={{field}}
+            @cardTypeFor={{cardTypeFor}}
+            @childFormat={{getEditorChildFormat
+              @format
+              defaultFormats.cardDef
+              model
+            }}
+            @typeConstraint={{@typeConstraint}}
+            ...attributes
+          />
         {{else}}
           {{#let
             (coalesce @format defaultFormats.cardDef)
diff --git a/packages/host/tests/integration/components/per-usage-edit-override-test.gts b/packages/host/tests/integration/components/per-usage-edit-override-test.gts
deleted file mode 100644
index f48d6f38f5..0000000000
--- a/packages/host/tests/integration/components/per-usage-edit-override-test.gts
+++ /dev/null
@@ -1,251 +0,0 @@
-import type { TemplateOnlyComponent } from '@ember/component/template-only';
-
-import { getService } from '@universal-ember/test-support';
-import { module, test } from 'qunit';
-
-import {
-  PermissionsContextName,
-  type Permissions,
-  baseRealm,
-} from '@cardstack/runtime-common';
-import type { Loader } from '@cardstack/runtime-common/loader';
-
-import {
-  setupCardLogs,
-  setupLocalIndexing,
-  testRealmURL,
-  provideConsumeContext,
-  setupOperatorModeStateCleanup,
-} from '../../helpers';
-import {
-  CardDef,
-  Component,
-  contains,
-  containsMany,
-  field,
-  FieldDef,
-  linksTo,
-  linksToMany,
-  setupBaseRealm,
-  StringField,
-} from '../../helpers/base-realm';
-import { setupMockMatrix } from '../../helpers/mock-matrix';
-import { renderCard } from '../../helpers/render-component';
-import { setupRenderingTest } from '../../helpers/setup';
-
-module('Integration | per-usage edit override', function (hooks) {
-  let loader: Loader;
-
-  setupRenderingTest(hooks);
-  setupOperatorModeStateCleanup(hooks);
-  setupLocalIndexing(hooks);
-
-  setupMockMatrix(hooks, {
-    loggedInAs: '@testuser:localhost',
-    activeRealms: [testRealmURL],
-    autostart: true,
-  });
-
-  setupBaseRealm(hooks);
-  setupCardLogs(
-    hooks,
-    async () => await loader.import(`${baseRealm.url}card-api`),
-  );
-
-  hooks.beforeEach(function () {
-    loader = getService('loader-service').loader;
-    let permissions: Permissions = { canRead: true, canWrite: true };
-    provideConsumeContext(PermissionsContextName, permissions);
-  });
-
-  test('a contains field can override its edit component per usage', async function (assert) {
-    const CustomEditor: TemplateOnlyComponent<{
-      Args: { model: unknown };
-    }> = <template>
-      <div data-test-custom-contains-editor>custom</div>
-    </template>;
-
-    class Card extends CardDef {
-      @field nickname = contains(StringField, { edit: CustomEditor });
-    }
-
-    await renderCard(loader, new Card({ nickname: 'Spike' }), 'edit');
-
-    assert
-      .dom('[data-test-custom-contains-editor]')
-      .exists('the per-usage override renders');
-    assert
-      .dom('[data-test-field="nickname"] input')
-      .doesNotExist('the default string editor is suppressed');
-  });
-
-  test('the override wins even when the FieldDef aliases its embedded and edit slots', async function (assert) {
-    const SharedView: TemplateOnlyComponent<{ Args: { model: unknown } }> =
-      <template>
-        <div data-test-shared-view>shared</div>
-      </template>;
-
-    class SharedField extends FieldDef {
-      static embedded = SharedView;
-      static edit = SharedView;
-    }
-
-    const CustomEditor: TemplateOnlyComponent<{
-      Args: { model: unknown };
-    }> = <template>
-      <div data-test-shared-field-custom-editor>custom</div>
-    </template>;
-
-    class Card extends CardDef {
-      @field thing = contains(SharedField, { edit: CustomEditor });
-    }
-
-    await renderCard(loader, new Card(), 'edit');
-
-    assert
-      .dom('[data-test-shared-field-custom-editor]')
-      .exists('the per-usage override wins over the shared view slot');
-    assert
-      .dom('[data-test-shared-view]')
-      .doesNotExist('the shared view slot is not used in edit format');
-  });
-
-  test('a linksTo field can override its edit component per usage', async function (assert) {
-    class Friend extends CardDef {
-      @field name = contains(StringField);
-    }
-
-    const CustomLinksToEditor: TemplateOnlyComponent<{
-      Args: { model: unknown };
-    }> = <template>
-      <div data-test-custom-links-to-editor>custom</div>
-    </template>;
-
-    class Person extends CardDef {
-      @field bestFriend = linksTo(Friend, { edit: CustomLinksToEditor });
-    }
-
-    await renderCard(loader, new Person(), 'edit');
-
-    assert
-      .dom('[data-test-custom-links-to-editor]')
-      .exists('the per-usage override renders');
-    assert
-      .dom('[data-test-links-to-editor="bestFriend"]')
-      .doesNotExist('the default LinksToEditor is suppressed');
-  });
-
-  test('a containsMany override receives @defaultEditor for the wrap contract', async function (assert) {
-    const WrapEditor: TemplateOnlyComponent<{
-      Args: { model: unknown; values: unknown; defaultEditor: unknown };
-    }> = <template>
-      <div data-test-wrap>
-        <div data-test-wrap-banner>wrap banner</div>
-        {{#let @defaultEditor as |DefaultEditor|}}
-          <DefaultEditor />
-        {{/let}}
-      </div>
-    </template>;
-
-    class Tagged extends CardDef {
-      @field tags = containsMany(StringField, { edit: WrapEditor });
-    }
-
-    await renderCard(loader, new Tagged({ tags: ['alpha', 'beta'] }), 'edit');
-
-    assert.dom('[data-test-wrap]').exists('the wrap override renders');
-    assert
-      .dom('[data-test-wrap-banner]')
-      .exists('the wrap contributes its own UI');
-    assert
-      .dom('[data-test-wrap] [data-test-contains-many="tags"]')
-      .exists('rendering @defaultEditor produces the standard editor');
-    assert
-      .dom('[data-test-wrap] [data-test-contains-many="tags"] [data-test-item]')
-      .exists({ count: 2 }, 'all values flow through the default iteration');
-  });
-
-  test('a containsMany override receives splattributes from the caller', async function (assert) {
-    const WrapEditor: TemplateOnlyComponent<{
-      Args: { model: unknown; values: unknown; defaultEditor: unknown };
-      Element: HTMLDivElement;
-    }> = <template>
-      <div data-test-contains-attr-wrap ...attributes>wrap</div>
-    </template>;
-
-    class Tagged extends CardDef {
-      @field tags = containsMany(StringField, { edit: WrapEditor });
-      static edit = class Edit extends Component<typeof this> {
-        <template><@fields.tags data-test-from-caller='yes' /></template>
-      };
-    }
-
-    await renderCard(loader, new Tagged({ tags: ['a'] }), 'edit');
-
-    assert
-      .dom('[data-test-contains-attr-wrap][data-test-from-caller="yes"]')
-      .exists('attributes from the field site reach the override');
-  });
-
-  test('a linksToMany override receives @defaultEditor for the wrap contract', async function (assert) {
-    class Pet extends CardDef {
-      @field name = contains(StringField);
-    }
-
-    const WrapEditor: TemplateOnlyComponent<{
-      Args: { model: unknown; values: unknown; defaultEditor: unknown };
-    }> = <template>
-      <div data-test-wrap-many>
-        <div data-test-wrap-many-banner>wrap banner</div>
-        {{#let @defaultEditor as |DefaultEditor|}}
-          <DefaultEditor />
-        {{/let}}
-      </div>
-    </template>;
-
-    class Owner extends CardDef {
-      @field pets = linksToMany(Pet, { edit: WrapEditor });
-    }
-
-    await renderCard(loader, new Owner(), 'edit');
-
-    assert.dom('[data-test-wrap-many]').exists('the wrap override renders');
-    assert
-      .dom('[data-test-wrap-many-banner]')
-      .exists('the wrap contributes its own UI');
-    assert
-      .dom('[data-test-wrap-many] [data-test-links-to-many="pets"]')
-      .exists('rendering @defaultEditor produces the standard editor');
-    assert
-      .dom('[data-test-wrap-many] [data-test-add-new="pets"]')
-      .exists(
-        'the standard LinksToManyEditor add affordance is rendered through the wrap',
-      );
-  });
-
-  test('a linksToMany override receives splattributes from the caller', async function (assert) {
-    class Pet extends CardDef {
-      @field name = contains(StringField);
-    }
-
-    const WrapEditor: TemplateOnlyComponent<{
-      Args: { model: unknown; values: unknown; defaultEditor: unknown };
-      Element: HTMLDivElement;
-    }> = <template>
-      <div data-test-attr-wrap ...attributes>wrap</div>
-    </template>;
-
-    class Owner extends CardDef {
-      @field pets = linksToMany(Pet, { edit: WrapEditor });
-      static edit = class Edit extends Component<typeof this> {
-        <template><@fields.pets data-test-from-caller='yes' /></template>
-      };
-    }
-
-    await renderCard(loader, new Owner(), 'edit');
-
-    assert
-      .dom('[data-test-attr-wrap][data-test-from-caller="yes"]')
-      .exists('attributes from the field site reach the override');
-  });
-});