diff --git a/commerce_discount.install b/commerce_discount.install
index 0388e49..5fad08c 100644
--- a/commerce_discount.install
+++ b/commerce_discount.install
@@ -1104,23 +1104,15 @@ function commerce_discount_update_7110() {
     field_delete_field('commerce_discount_max_uses');
   }
 
-  $disabled_message = '';
+  $disable_modules = array('commerce_discount_usage', 'commerce_discount_date');
 
-  // Disable the existing modules if they are enabled.
-  if (module_exists('commerce_discount_usage')) {
-    $disable_modules[] = 'commerce_discount_usage';
-  }
-  if (module_exists('commerce_discount_date')) {
-    $disable_modules[] = 'commerce_discount_date';
-  }
-
-  if (count($disable_modules) > 0) {
-    module_disable($disable_modules);
-    $disabled_message = ' ' . t('Disabled modules: !modules',
-      array('!modules' => implode(', ', $disable_modules)));
-  }
+  db_update('system')
+    ->fields(array('status' => 0))
+    ->condition('name', $disable_modules)
+    ->condition('type', 'module')
+    ->execute();
 
   field_info_cache_clear();
 
-  return t('Discount and max uses now in core.') . $disabled_message;
+  return t('Discount date and usage sub-modules are now in core.');
 }
diff --git a/modules/commerce_discount_date/commerce_discount_date.info b/modules/commerce_discount_date/commerce_discount_date.info
deleted file mode 100644
index 3487a00..0000000
--- a/modules/commerce_discount_date/commerce_discount_date.info
+++ /dev/null
@@ -1,3 +0,0 @@
-name = Commerce Discount Date
-description = Provides date fields for the Commerce discount entity.
-package = Commerce (contrib)
diff --git a/modules/commerce_discount_date/commerce_discount_date.module b/modules/commerce_discount_date/commerce_discount_date.module
deleted file mode 100644
index 1accd14..0000000
--- a/modules/commerce_discount_date/commerce_discount_date.module
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-/**
- * @file
- * This module has been moved into the core discounts module.
- *
- * @deprecated
- */
diff --git a/modules/commerce_discount_usage/commerce_discount_usage.info b/modules/commerce_discount_usage/commerce_discount_usage.info
deleted file mode 100644
index e9b9726..0000000
--- a/modules/commerce_discount_usage/commerce_discount_usage.info
+++ /dev/null
@@ -1,3 +0,0 @@
-name = Commerce Discount Usage
-description = Provide usage tracking and limits for Commerce Discounts
-package = Commerce (contrib)
diff --git a/modules/commerce_discount_usage/commerce_discount_usage.module b/modules/commerce_discount_usage/commerce_discount_usage.module
deleted file mode 100644
index 1accd14..0000000
--- a/modules/commerce_discount_usage/commerce_discount_usage.module
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-/**
- * @file
- * This module has been moved into the core discounts module.
- *
- * @deprecated
- */