diff --git a/README.txt b/README.txt
index 444dd0a..745dd7f 100644
--- a/README.txt
+++ b/README.txt
@@ -13,9 +13,8 @@ you are interested in using it for development.
 
 Advanced usage:
 ---------------
-If you've the features (https://drupal.org/project/features) module enabled you
-can optimize cache clearing performance by setting the variable
-'features_rebuild_on_flush' to FALSE. This skips rebuilding of feature
+You can optimize cache clearing performance by setting the variable
+'entity_rebuild_on_flush' to FALSE. This skips rebuilding of feature
 components and exported entities during cache flushing. Instead, it is triggered
 by the features module only; e.g., when features are reverted.
 
diff --git a/entity.install b/entity.install
index f6f8cc2..118820b 100644
--- a/entity.install
+++ b/entity.install
@@ -14,6 +14,14 @@ function entity_enable() {
 }
 
 /**
+ * Implements hook_uninstall().
+ */
+function entity_uninstall() {
+  // Delete variables.
+  variable_del('entity_rebuild_on_flush');
+}
+
+/**
  * The entity API modules have been merged into a single module.
  */
 function entity_update_7000() {
diff --git a/entity.module b/entity.module
index e507e02..4ce6031 100644
--- a/entity.module
+++ b/entity.module
@@ -1079,7 +1079,7 @@ function entity_flush_caches() {
   // Also check if features has explicitly disabled rebuilding on cache flush.
   // If the variable is set features is installed and will take care of the re-
   // build whenever the features page is visited anyway.
-  if (current_path() != 'admin/modules/list/confirm' && variable_get('features_rebuild_on_flush', TRUE)) {
+  if (current_path() != 'admin/modules/list/confirm' && variable_get('entity_rebuild_on_flush', TRUE)) {
     entity_defaults_rebuild();
   }