diff --git a/entity.features.inc b/entity.features.inc
index 73626c4..245380c 100644
--- a/entity.features.inc
+++ b/entity.features.inc
@@ -146,7 +146,6 @@ class EntityDefaultFeaturesController {
   function rebuild($module = NULL) {
     // We don't do the rebuild here since a whole rebuild is triggered in
     // entity_features_post_restore().
-    // entity_defaults_rebuild(array($this->type));
   }
 }
 
@@ -215,7 +214,7 @@ function entity_features_rebuild($module = NULL, $entity_type) {
 /**
  * Implements hook_features_post_restore().
  *
- * Revert all defaults when a features rebuild is triggered - even the ones not
+ * Rebuild all defaults when a features rebuild is triggered - even the ones not
  * handled by features itself.
  */
 function entity_features_post_restore($op, $items = array()) {
diff --git a/entity.module b/entity.module
index 4ce6031..1804762 100644
--- a/entity.module
+++ b/entity.module
@@ -1076,9 +1076,7 @@ function entity_flush_caches() {
   // case of enabling or disabling modules we already rebuild defaults in
   // entity_modules_enabled() and entity_modules_disabled(), so we do not need
   // to do it again.
-  // 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.
+  // Also check if rebuilding on cache flush is explicitly disabled.
   if (current_path() != 'admin/modules/list/confirm' && variable_get('entity_rebuild_on_flush', TRUE)) {
     entity_defaults_rebuild();
   }
