diff --git a/src/components/Link/Link.scss b/src/components/Link/Link.scss
index 3cac6a01717422..20a2b466e1a26c 100644
--- a/src/components/Link/Link.scss
+++ b/src/components/Link/Link.scss
@@ -10,12 +10,18 @@
 
 @mixin ms-Link {
   @include ms-baseFont;
+  @include focus-border();
   font-size: $ms-font-size-m;
   font-weight: $ms-font-weight-regular;
   color: $ms-color-themePrimary;
   text-decoration: none;
   cursor: pointer;
-  outline: none;
+  padding: 0;
+  margin: 0;
+  background: none;
+  @include text-align(left);
+  display: inline;
+  border: none;
 
   &:hover,
   &:focus {
@@ -38,23 +44,3 @@
 .ms-Link {
   @include ms-Link;
 }
-
-// TODO: Remove overrides below.
-
-.ms-Link,
-BUTTON.ms-Link {
-  @include focus-border();
-
-  /* Needed for buttons disguised as links scenario. */
-  font-family: inherit;
-  font-size: inherit;
-  font-weight: normal;
-
-  border: none;
-  background: none;
-  @include text-align(left);
-  display: inline;
-  padding: 0;
-  margin: 0;
-}
-