diff --git a/core/lib/Drupal/Component/Serialization/Yaml.php b/core/lib/Drupal/Component/Serialization/Yaml.php
index 7d0f0c5..1f6d304 100644
--- a/core/lib/Drupal/Component/Serialization/Yaml.php
+++ b/core/lib/Drupal/Component/Serialization/Yaml.php
@@ -8,7 +8,8 @@
 namespace Drupal\Component\Serialization;
 
 use Drupal\Component\Serialization\Exception\InvalidDataTypeException;
-use Symfony\Component\Yaml\Yaml as Symfony;
+use Symfony\Component\Yaml\Parser;
+use Symfony\Component\Yaml\Dumper;
 
 /**
  * Default serialization for YAML using the Symfony component.
@@ -20,7 +21,9 @@ class Yaml implements SerializationInterface {
    */
   public static function encode($data) {
     try {
-      return Symfony::dump($data, PHP_INT_MAX, 2, TRUE);
+      $yaml = new Dumper();
+      $yaml->setIndentation(2);
+      return $yaml->dump($data, PHP_INT_MAX, 0, TRUE, FALSE);
     }
     catch (\Exception $e) {
       throw new InvalidDataTypeException($e->getMessage(), $e->getCode(), $e);
@@ -32,7 +35,8 @@ public static function encode($data) {
    */
   public static function decode($raw) {
     try {
-      return Symfony::parse($raw, TRUE);
+      $yaml = new Parser();
+      return $yaml->parse($raw, TRUE, FALSE);
     }
     catch (\Exception $e) {
       throw new InvalidDataTypeException($e->getMessage(), $e->getCode(), $e);