diff --git a/core/misc/tabledrag.js b/core/misc/tabledrag.js
index 8b3021ad6324869e2281d1c26d2f37d01361494b..a803f66cfd183307802f0057f568e1445bae9099 100644
--- a/core/misc/tabledrag.js
+++ b/core/misc/tabledrag.js
@@ -1244,7 +1244,7 @@ $.extend(Drupal.theme, {
     return '<div class="indentation">&nbsp;</div>';
   },
   tableDragChangedWarning: function () {
-    return '<div class="tabledrag-changed-warning messages warning" role="alert">' + Drupal.theme('tableDragChangedMarker') + ' ' + Drupal.t('Changes made in this table will not be saved until the form is submitted.') + '</div>';
+    return '<div class="tabledrag-changed-warning messages warning" role="alert">' + Drupal.theme('tableDragChangedMarker') + ' ' + Drupal.t('You have unsaved changes.') + '</div>';
   }
 });
 
diff --git a/core/modules/block/block.js b/core/modules/block/block.js
index 3084fb3dd06763fa07c55d6517fd656bd13d47c3..7025ce172f4bc6207ef41541f43e3e0ffac69467 100644
--- a/core/modules/block/block.js
+++ b/core/modules/block/block.js
@@ -63,11 +63,6 @@ Drupal.behaviors.blockDrag = {
       checkEmptyRegions(table, this);
     };
 
-    // A custom message for the blocks page specifically.
-    Drupal.theme.tableDragChangedWarning = function () {
-      return '<div class="messages warning">' + Drupal.theme('tableDragChangedMarker') + ' ' + Drupal.t('The changes to these blocks will not be saved until the <em>Save blocks</em> button is clicked.') + '</div>';
-    };
-
     // Add a handler so when a row is dropped, update fields dropped into new regions.
     tableDrag.onDrop = function () {
       var dragObject = this;
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/CachedDataUITest.php b/core/modules/views/lib/Drupal/views/Tests/UI/CachedDataUITest.php
index 438111becf021ffd4cb17b9b8b190d9ae4d3c5ea..449f0feb4e4f78d32cc726ee4c3ce89aad6702b7 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/CachedDataUITest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/UI/CachedDataUITest.php
@@ -41,7 +41,7 @@ public function testCacheData() {
     $this->drupalGet('admin/structure/views/view/test_view/edit');
     // Make sure we have 'changes' to the view.
     $this->drupalPost('admin/structure/views/nojs/display/test_view/default/title', array(), t('Apply'));
-    $this->assertText('All changes are stored temporarily.', 'The view has been changed.');
+    $this->assertText('You have unsaved changes.');
 
     $view_cache = $temp_store->get('test_view');
     // The view should be enabled.
diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewEditFormController.php b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
index ade339a685e5e63bdaf6453a5f94bbee3f82296a..5a0780e48c0dc61b33082d5c17da82a34a77668f 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
@@ -99,7 +99,7 @@ public function form(array $form, array &$form_state, EntityInterface $view) {
       $form['changed'] = array(
         '#type' => 'container',
         '#attributes' => array('class' => array('view-changed', 'messages', 'warning')),
-        '#children' => t('All changes are stored temporarily. Click "Save" to make your changes permanent. Click "Cancel" to discard your changes.'),
+        '#children' => t('You have unsaved changes.'),
         '#weight' => -10,
       );
       if (empty($view->changed)) {