diff --git a/core/lib/Drupal/Core/Page/DefaultHtmlFragmentRenderer.php b/core/lib/Drupal/Core/Page/DefaultHtmlFragmentRenderer.php
index 9254b4487c426d10165c43797bcd3c6798c8f075..93d9b4011a0187c8adcd620cfd5431103958cc3b 100644
--- a/core/lib/Drupal/Core/Page/DefaultHtmlFragmentRenderer.php
+++ b/core/lib/Drupal/Core/Page/DefaultHtmlFragmentRenderer.php
@@ -127,9 +127,7 @@ protected function setDefaultMetaTags(HtmlPage $page) {
     )));
 
     // Display the html.html.twig's default mobile metatags for responsive design.
-    $page->addMetaElement(new MetaElement(NULL, array('name' => 'MobileOptimized', 'content' => 'width')));
-    $page->addMetaElement(new MetaElement(NULL, array('name' => 'HandheldFriendly', 'content' => 'true')));
-    $page->addMetaElement(new MetaElement(NULL, array('name' => 'viewport', 'content' => 'width=device-width')));
+    $page->addMetaElement(new MetaElement(NULL, array('name' => 'viewport', 'content' => 'width=device-width, initial-scale=1.0')));
   }
 
 }
diff --git a/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php b/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php
index b235aed92b67500ba902cecd118a1e6ee33ea1f9..ce750bf0fd368ef620ac6c0a20c5120d306941bf 100644
--- a/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php
+++ b/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php
@@ -25,9 +25,7 @@ public static function getInfo() {
   function setUp() {
     parent::setUp();
     $this->default_metatags = array(
-      'MobileOptimized' => '<meta name="MobileOptimized" content="width" />',
-      'HandheldFriendly' => '<meta name="HandheldFriendly" content="true" />',
-      'viewport' => '<meta name="viewport" content="width=device-width" />',
+      'viewport' => '<meta name="viewport" content="width=device-width, initial-scale=1.0" />',
     );
   }