diff --git a/core/modules/views/views.install b/core/modules/views/views.install
index 5d63efa..b5ab30a 100644
--- a/core/modules/views/views.install
+++ b/core/modules/views/views.install
@@ -35,44 +35,40 @@ function views_update_last_removed() {
 }
 
 /**
- * Convert settings to the config system.
+ * Set the Views schema version.
  */
 function views_update_8000() {
-  update_variables_to_config('views.settings', array(
-    'views_ui_show_listing_filters' => 'ui.show.listing_filters',
-    'views_ui_show_master_display' => 'ui.show.master_display',
-    'views_ui_show_advanced_column' => 'ui.show.advanced_column',
-    'views_ui_display_embed' => 'ui.show.display_embed',
-    'views_ui_custom_theme' => 'ui.custom_theme',
-    'views_exposed_filter_any_label' => 'exposed_filter_any_label',
-    'views_ui_always_live_preview' => 'ui.always_live_preview',
-    'views_ui_always_live_preview_button' => 'ui.always_live_preview_button',
-    'views_ui_show_preview_information' => 'ui.show.preview_information',
-    'views_ui_show_sql_query_where' => 'ui.show.sql_query.where',
-    'views_ui_show_sql_query' => 'ui.show_sql.query.enabled',
-    'views_ui_show_performance_statistics' => 'ui.show.performance_statistics',
-    'views_show_additional_queries' => 'ui.show.additional_queries',
-    'views_skip_cache' => 'skip_cache',
-    'views_sql_signature' => 'sql_signature',
-    'views_no_javascript' => 'no_javascript',
-    'views_devel_output' => 'debug.output',
-    'views_devel_region' => 'debug.region',
-    'views_display_extenders' => 'display_extenders',
-  ));
+  // No update, just set the schema version to 8000.
 }
 
 /**
- * Rename the {cache_views} and {cache_views_data} tables.
+ * Implements hook_requirements().
  */
-function views_update_8001() {
-  db_rename_table('cache_views', 'cache_views_info');
-  db_rename_table('cache_views_data', 'cache_views_results');
-}
+function views_requirements($phase) {
+  $requirements = array();
+  $t = get_t();
 
-/**
- * Remove the {views_view} and {views_display} table.
- */
-function views_update_8002() {
-  db_drop_table('views_view');
-  db_drop_table('views_display');
+  // Display a warning if the user attempts to update with a Drupal 7 version
+  // of Views. An upgrade path is provided by the views_d8_upgrade contributed
+  // module, which uninstalls Views before beginning the Drupal 8 upgrade.
+  if ($phase == 'update') {
+    // If Views is installed but has a schema version less than 8000, we can
+    // assume it is a pre-Drupal version of Views from contrib.
+    $version = (int) drupal_get_installed_schema_version('views');
+    if (($version != SCHEMA_UNINSTALLED) && ($version < 8000)) {
+      $requirements['views_upgrade'] = array(
+        'title' => $t('Installed Views version'),
+        'value' => $version,
+        'severity' => REQUIREMENT_ERROR,
+        'description' => $t(
+          'Your installed version of Views is too old. To migrade Views data from Drupal 7, install and run the <a href="@url">Views Drupal 7 to Drupal 8 upgrade</a> module before installing Drupal 8.',
+          array(
+            '@url' => url('http://drupal.org/project/views_d8_upgrade'),
+          )
+        ),
+      );
+    }
+  }
+
+  return $requirements;
 }