diff --git a/core/modules/locale/lib/Drupal/locale/StringDatabaseStorage.php b/core/modules/locale/lib/Drupal/locale/StringDatabaseStorage.php
index 33138e7..bb1b28b 100644
--- a/core/modules/locale/lib/Drupal/locale/StringDatabaseStorage.php
+++ b/core/modules/locale/lib/Drupal/locale/StringDatabaseStorage.php
@@ -9,7 +9,6 @@
 
 use Drupal\Core\Database\Database;
 use Drupal\Core\Database\Connection;
-use PDO;
 
 /**
  * Defines the locale string class.
@@ -63,27 +62,31 @@ public function getTranslations(array $conditions = array(), array $options = ar
    * Implements Drupal\locale\StringStorageInterface::findString().
    */
   public function findString(array $conditions) {
-    $string = $this->dbStringSelect($conditions)
-    ->execute()
-    ->fetchObject('Drupal\locale\SourceString');
-    if ($string) {
+    $values = $this->dbStringSelect($conditions)
+      ->execute()
+      ->fetchAssoc();
+
+    if (!empty($values)) {
+      $string = new SourceString($values);
       $string->setStorage($this);
+      return $string;
     }
-    return $string;
   }
 
   /**
    * Implements Drupal\locale\StringStorageInterface::findTranslation().
    */
   public function findTranslation(array $conditions) {
-    $string = $this->dbStringSelect($conditions, array('translation' => TRUE))
-    ->execute()
-    ->fetchObject('Drupal\locale\TranslationString');
-    if ($string) {
+    $values = $this->dbStringSelect($conditions, array('translation' => TRUE))
+      ->execute()
+      ->fetchAssoc();
+
+    if (!empty($values)) {
+      $string = new TranslationString($values);
       $this->checkVersion($string, VERSION);
       $string->setStorage($this);
+      return $string;
     }
-    return $string;
   }
 
   /**
@@ -359,11 +362,12 @@ protected function dbStringDefaults($string, $table = NULL) {
    *   Array of objects of the class requested.
    */
   protected function dbStringLoad(array $conditions, array $options, $class) {
+    $strings = array();
     $result = $this->dbStringSelect($conditions, $options)->execute();
-    $result->setFetchMode(PDO::FETCH_CLASS, $class);
-    $strings = $result->fetchAll();
-    foreach ($strings as $string) {
+    foreach ($result as $item) {
+      $string = new $class($item);
       $string->setStorage($this);
+      $strings[] = $string;
     }
     return $strings;
   }