diff --git a/core/modules/entity/entity.class.inc b/core/modules/entity/entity.class.inc
index 2c98143..f09fcc3 100644
--- a/core/modules/entity/entity.class.inc
+++ b/core/modules/entity/entity.class.inc
@@ -141,10 +141,6 @@ interface EntityInterface {
    * @see entity_get_info()
    */
   public function entityInfo();
-
-  /**
-   * @todo Add invokeHook*() methods.
-   */
 }
 
 /**
@@ -291,29 +287,20 @@ class Entity implements EntityInterface {
    * Implements EntityInterface::get().
    *
    * @todo
-   *   Implement default handling of language.
+   *   Implement language handling.
    */
   public function get($property_name, $language = NULL) {
-    $value = isset($this->$property_name) ? $this->$property_name : NULL;
-    if (isset($language)) {
-      return isset($value[$language]) ? $value[$language] : NULL;
-    }
-    return $value;
+    return isset($this->$property_name) ? $this->$property_name : NULL;
   }
 
   /**
    * Implements EntityInterface::set().
    *
    * @todo
-   *   Implement default handling of language.
+   *   Implement language handling.
    */
   public function set($property_name, $value, $language = NULL) {
-    if (isset($language)) {
-      $this->$property_name[$language] = $value;
-    }
-    else {
-      $this->$property_name = $value;
-    }
+    $this->$property_name = $value;
   }
 
   /**