--- hardcoded2.patch	2012-04-11 01:41:32.000000000 +0200
+++ 1512564-18-remove-entity-info-hardcoded.patch	2012-04-11 03:18:09.000000000 +0200
@@ -23,7 +23,7 @@ index bce8b56..cb4d6d6 100644
  
  /**
 diff --git a/core/modules/entity/entity.class.inc b/core/modules/entity/entity.class.inc
-index 7ffd496..8a26763 100644
+index 7ffd496..2311af5 100644
 --- a/core/modules/entity/entity.class.inc
 +++ b/core/modules/entity/entity.class.inc
 @@ -146,27 +146,6 @@ class Entity implements EntityInterface {
@@ -96,7 +96,7 @@ index 7ffd496..8a26763 100644
     */
    public function bundle() {
 -    return isset($this->bundleKey) ? $this->{$this->bundleKey} : $this->entityType;
-+    return $this->entityType();
++    return $this->entityType;
    }
  
    /**
@@ -220,3 +220,16 @@ index 0bd31ef..401b5e1 100644
        $term->langcode = $langcode;
        taxonomy_term_save($term);
        $items[$delta]['tid'] = $term->tid;
+diff --git a/core/modules/taxonomy/taxonomy.test b/core/modules/taxonomy/taxonomy.test
+index 00c29dd..65d6805 100644
+--- a/core/modules/taxonomy/taxonomy.test
++++ b/core/modules/taxonomy/taxonomy.test
+@@ -400,7 +400,7 @@ class TaxonomyVocabularyUnitTest extends TaxonomyWebTestCase {
+     // connected to this vocabulary name should have been removed when the
+     // module was uninstalled. Creating a new field with the same name and
+     // an instance of this field on the same bundle name should be successful.
+-    unset($this->vocabulary->vid);
++    $this->vocabulary->enforceIsNew();
+     taxonomy_vocabulary_save($this->vocabulary);
+     unset($this->field['id']);
+     field_create_field($this->field);