diff --git a/dart.install b/dart.install
index d97e466..4df57db 100644
--- a/dart.install
+++ b/dart.install
@@ -155,14 +155,14 @@ function dart_update_6200() {
     // Update any blocks that were created for this tag.
     db_update('block')
       ->fields(array(
-        'delta' => 'dart-tag-' . $machinename,
+        'delta' => $machinename,
       ))
       ->condition('module', 'dart')
       ->condition('delta', 'dart-tag-' . $tag->dtid)
       ->execute();
     db_update('block_role')
       ->fields(array(
-        'delta' => 'dart-tag-' . $machinename,
+        'delta' => $machinename,
       ))
       ->condition('delta', 'dart-tag-' . $tag->dtid)
       ->execute();
@@ -225,6 +225,35 @@ function dart_update_7200() {
 }
 
 /**
+ * Remove "dart-tag-" from the beginning of block deltas to avoid deltas that are too
+ * long.
+ */
+function dart_update_7201() {
+  $select = db_select('block', 'b');
+  $select->addField('b', 'module');
+  $select->addField('b', 'delta');
+  $select->condition('b.module', 'dart');
+  $blocks = $select->execute()->fetchAll(PDO::FETCH_ASSOC);
+
+  foreach ($blocks as $block) {
+    $block['delta'] = str_replace('dart-tag-', '', $block['delta']);
+    db_update('block')
+      ->fields(array(
+        'delta' => $block['delta'],
+      ))
+      ->condition('module', $block['module'])
+      ->condition('delta', 'dart-tag-' . $block['delta'])
+      ->execute();
+    db_update('block_role')
+      ->fields(array(
+        'delta' => $block['delta'],
+      ))
+      ->condition('delta', 'dart-tag-' . $block['delta'])
+      ->execute();
+  }
+}
+
+/**
  * Helper function to rename variables in the variables table.
  *
  * @param $variables
diff --git a/dart.module b/dart.module
index 4253024..683c0d9 100644
--- a/dart.module
+++ b/dart.module
@@ -90,8 +90,8 @@ function dart_block_info() {
   $tags = _dart_block_tags();
   $blocks = array();
   foreach ($tags as $tag) {
-    $blocks['dart-tag-' . $tag->machinename]['info'] = t('DART tag: !tagname', array('!tagname' => $tag->name));
-    $blocks['dart-tag-' . $tag->machinename]['cache'] = DRUPAL_CACHE_PER_PAGE;
+    $blocks[$tag->machinename]['info'] = t('DART tag: !tagname', array('!tagname' => $tag->name));
+    $blocks[$tag->machinename]['cache'] = DRUPAL_CACHE_PER_PAGE;
   }
   return $blocks;
 }
@@ -110,8 +110,7 @@ function dart_block_save($delta, $edit) { }
  * Implements hook_block_view().
  */
 function dart_block_view($delta) {
-  $machinename = str_replace('dart-tag-', '', $delta);
-  $block['content'] = dart_tag($machinename);
+  $block['content'] = dart_tag($delta);
   return $block;
 }