diff --git a/src/lib/form-field/form-field.ts b/src/lib/form-field/form-field.ts
index 4c2d5e4e342..6630137fe74 100644
--- a/src/lib/form-field/form-field.ts
+++ b/src/lib/form-field/form-field.ts
@@ -81,8 +81,7 @@ export const MAT_FORM_FIELD_DEFAULT_OPTIONS =
 /** Container for form controls that applies Material Design styling and behavior. */
 @Component({
   moduleId: module.id,
-  // TODO(mmalerba): the input-container selectors and classes are deprecated and will be removed.
-  selector: 'mat-input-container, mat-form-field',
+  selector: 'mat-form-field',
   exportAs: 'matFormField',
   templateUrl: 'form-field.html',
   // MatInput is a directive and can't have styles, so we need to include its styles here.