diff --git a/scss/_reboot.scss b/scss/_reboot.scss
index 8abdf1e8c7..d4167cc8ec 100644
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
@@ -14,9 +14,7 @@
 // 2. Change the default font family in all browsers.
 // 3. Correct the line height in all browsers.
 // 4. Prevent adjustments of font size after orientation changes in IE on Windows Phone and in iOS.
-// 5. Setting @viewport causes scrollbars to overlap content in IE11 and Edge, so
-//    we force a non-overlapping, non-auto-hiding scrollbar to counteract.
-// 6. Change the default tap highlight to be completely transparent in iOS.
+// 5. Change the default tap highlight to be completely transparent in iOS.
 
 *,
 *::before,
@@ -28,15 +26,7 @@ html {
   font-family: sans-serif; // 2
   line-height: 1.15; // 3
   -webkit-text-size-adjust: 100%; // 4
-  -ms-overflow-style: scrollbar; // 5
-  -webkit-tap-highlight-color: rgba($black, 0); // 6
-}
-
-// IE10+ doesn't honor `<meta name="viewport">` in some cases.
-@at-root {
-  @-ms-viewport {
-    width: device-width;
-  }
+  -webkit-tap-highlight-color: rgba($black, 0); // 5
 }
 
 // Shim for "new" HTML5 structural elements to display correctly (IE10, older browsers)
@@ -240,9 +230,6 @@ pre {
   margin-bottom: 1rem;
   // Don't allow content to break outside
   overflow: auto;
-  // We have @viewport set which causes scrollbars to overlap content in IE11 and Edge, so
-  // we force a non-overlapping, non-auto-hiding scrollbar to counteract.
-  -ms-overflow-style: scrollbar;
 }
 
 
diff --git a/scss/bootstrap-grid.scss b/scss/bootstrap-grid.scss
index 16f5f0dfb9..d435432419 100644
--- a/scss/bootstrap-grid.scss
+++ b/scss/bootstrap-grid.scss
@@ -5,10 +5,6 @@
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
 
-@at-root {
-  @-ms-viewport { width: device-width; } // stylelint-disable-line at-rule-no-vendor-prefix
-}
-
 html {
   box-sizing: border-box;
   -ms-overflow-style: scrollbar;
diff --git a/site/_data/browser-bugs.yml b/site/_data/browser-bugs.yml
index 509bf960ca..7138c75b42 100644
--- a/site/_data/browser-bugs.yml
+++ b/site/_data/browser-bugs.yml
@@ -48,16 +48,6 @@
   origin: >
     Bootstrap#18504
 
--
-  browser: >
-    Edge
-  summary: >
-    `@-ms-viewport{width: device-width;}` has side-effect of making scrollbars auto-hide
-  upstream_bug: >
-    Edge#7165383
-  origin: >
-    Bootstrap#18543
-
 -
   browser: >
     Edge