diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
index 81281ed..e115bd2 100644
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
@@ -523,9 +523,9 @@ protected function loadFromSharedTables(array &$values, array &$translations) {
         // If there are no data fields then only revisioned fields are needed
         // else both data fields and revisioned fields are needed to map the
         // entity values.
-        $fields = $revisioned_fields;
+        $all_fields = $revisioned_fields;
         if ($data_fields) {
-          $fields = array_merge($revisioned_fields, $data_fields);
+          $all_fields = array_merge($revisioned_fields, $data_fields);
           $query->leftJoin($this->dataTable, 'data', "(revision.$this->idKey = data.$this->idKey)");
           $column_names = [];
           // Some fields can have more then one columns in the data table so
@@ -548,7 +548,7 @@ protected function loadFromSharedTables(array &$values, array &$translations) {
         $query->condition('revision.' . $this->revisionKey, $revision_ids, 'IN');
       }
       else {
-        $fields = $table_mapping->getFieldNames($this->dataTable);
+        $all_fields = $table_mapping->getFieldNames($this->dataTable);
       }
 
       $result = $query->execute();
@@ -561,7 +561,7 @@ protected function loadFromSharedTables(array &$values, array &$translations) {
 
         $translations[$id][$langcode] = TRUE;
 
-        foreach ($fields as $field_name) {
+        foreach ($all_fields as $field_name) {
           $columns = $table_mapping->getColumnNames($field_name);
           // Do not key single-column fields by property name.
           if (count($columns) == 1) {