diff --git a/core/modules/locale/lib/Drupal/locale/StringDatabaseStorage.php b/core/modules/locale/lib/Drupal/locale/StringDatabaseStorage.php
index 33138e7..a72df8c 100644
--- a/core/modules/locale/lib/Drupal/locale/StringDatabaseStorage.php
+++ b/core/modules/locale/lib/Drupal/locale/StringDatabaseStorage.php
@@ -63,27 +63,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;
   }
 
   /**