1 files changed, 15 insertions, 7 deletions
diff --git a/modules/system/system.install b/modules/system/system.install
index a8aa9d927..6d9625774 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -1149,13 +1149,6 @@ function system_schema() {
         'default' => 0,
         'size' => 'tiny',
       ),
-      'throttle' => array(
-        'description' => t('Boolean indicating whether this item is disabled when the throttle.module disables throttleable items.'),
-        'type' => 'int',
-        'not null' => TRUE,
-        'default' => 0,
-        'size' => 'tiny',
-      ),
       'bootstrap' => array(
         'description' => t("Boolean indicating whether this module is loaded during Drupal's early bootstrapping phase (e.g. even before the page cache is consulted)."),
         'type' => 'int',
@@ -2853,6 +2846,21 @@ function system_update_7004(&$sandbox) {
 }
 
 /**
+ * Remove throttle columns and variables.
+ */
+function system_update_7005() {
+  $ret = array();
+  db_drop_field($ret, 'blocks', 'throttle');
+  db_drop_field($ret, 'system', 'throttle');
+  variable_del('throttle_user');
+  variable_del('throttle_anonymous');
+  variable_del('throttle_level');
+  variable_del('throttle_probability_limiter');
+
+  return $ret;
+}
+
+/**
  * @} End of "defgroup updates-6.x-to-7.x"
  * The next series of updates should start at 8000.
  */