diff --git a/core/modules/comment/comment.install b/core/modules/comment/comment.install
index 2c6d416..48bb5a4 100644
--- a/core/modules/comment/comment.install
+++ b/core/modules/comment/comment.install
@@ -16,7 +16,7 @@ function comment_uninstall() {
   variable_del('comment_block_count');
   $node_types = array_keys(node_type_get_types());
   foreach ($node_types as $node_type) {
-    field_attach_delete_bundle('comment', 'comment_node_' . $node_type, FALSE);
+    field_attach_delete_bundle('comment', 'comment_node_' . $node_type);
     variable_del('comment_' . $node_type);
     variable_del('comment_anonymous_' . $node_type);
     variable_del('comment_controls_' . $node_type);
diff --git a/core/modules/field/field.attach.inc b/core/modules/field/field.attach.inc
index 455f320..d33c4bc 100644
--- a/core/modules/field/field.attach.inc
+++ b/core/modules/field/field.attach.inc
@@ -1588,18 +1588,14 @@ function field_attach_rename_bundle($entity_type, $bundle_old, $bundle_new) {
  *   The entity type to which the bundle is bound.
  * @param $bundle
  *   The bundle to delete.
- * @param $field_cleanup
- *   If TRUE, the field will be deleted as well if its last instance is being
- *   deleted. If FALSE, it is the caller's responsibility to handle the case of
- *   fields left without instances. Defaults to TRUE.
  */
-function field_attach_delete_bundle($entity_type, $bundle, $field_cleanup = TRUE) {
+function field_attach_delete_bundle($entity_type, $bundle) {
   // First, delete the instances themselves. field_read_instances() must be
   // used here since field_info_instances() does not return instances for
   // disabled entity types or bundles.
   $instances = field_read_instances(array('entity_type' => $entity_type, 'bundle' => $bundle), array('include_inactive' => 1));
   foreach ($instances as $instance) {
-    field_delete_instance($instance, $field_cleanup);
+    field_delete_instance($instance);
   }
 
   // Clear the cache.