diff --git a/includes/admin.inc b/includes/admin.inc
index f0bb5a76d2509bb1e2ef51f159cf8a07ba0f9b40..467c5be3def9a7f7a9029aea24c42bb2b586a126 100644
--- a/includes/admin.inc
+++ b/includes/admin.inc
@@ -785,7 +785,7 @@ function views_ui_taxonomy_autocomplete_validate($element, &$form_state) {
     // Store the term ID of each (valid) tag that the user typed.
     $typed_terms = drupal_explode_tags($tags);
     foreach ($typed_terms as $typed_term) {
-      if ($terms = taxonomy_term_load_multiple(array(), array('name' => trim($typed_term), 'vid' => array_keys($vocabularies)))) {
+      if ($terms = entity_load_multiple_by_properties('taxonomy_term', array('name' => trim($typed_term), 'vid' => array_keys($vocabularies)))) {
         $term = array_pop($terms);
         $value['tids'][] = $term->tid;
       }
diff --git a/lib/Views/field/Plugin/views/field/Field.php b/lib/Views/field/Plugin/views/field/Field.php
index 5839be8a800678a983176106006f0abdd52bdc0c..647784e6351db620f02e60030a90f574af839d76 100644
--- a/lib/Views/field/Plugin/views/field/Field.php
+++ b/lib/Views/field/Plugin/views/field/Field.php
@@ -664,7 +664,7 @@ function post_execute(&$values) {
           $keys = array();
           foreach ($entity_ids as $key => $combined) {
             list($entity_id, $revision_id) = $combined;
-            $entity = entity_load_multiple($entity_type, array($entity_id), array($entity_info['entity keys']['revision'] => $revision_id));
+            $entity = entity_revision_load($entity_type, $revision_id);
             if ($entity) {
               $entities[$revision_id] = array_shift($entity);
               $keys[$key] = $revision_id;