jsonapi.services.yml                               |  4 ---
 src/Normalizer/ConfigEntityNormalizer.php          | 18 ++++------
 src/Normalizer/ScalarNormalizer.php                | 41 ----------------------
 .../JsonApiDocumentTopLevelNormalizerTest.php      |  4 +--
 .../Unit/Normalizer/ConfigEntityNormalizerTest.php |  4 +--
 5 files changed, 10 insertions(+), 61 deletions(-)

diff --git a/jsonapi.services.yml b/jsonapi.services.yml
index 2fda8c8..e66e5b5 100644
--- a/jsonapi.services.yml
+++ b/jsonapi.services.yml
@@ -35,10 +35,6 @@ services:
     arguments: ['@current_user']
     tags:
       - { name: normalizer, priority: 2 }
-  serializer.normalizer.scalar.jsonapi:
-    class: Drupal\jsonapi\Normalizer\ScalarNormalizer
-    tags:
-      - { name: normalizer, priority: 5 }
   serializer.normalizer.entity_reference_item.jsonapi:
     class: Drupal\jsonapi\Normalizer\RelationshipItemNormalizer
     arguments: ['@jsonapi.resource_type.repository', '@serializer.normalizer.jsonapi_document_toplevel.jsonapi',]
diff --git a/src/Normalizer/ConfigEntityNormalizer.php b/src/Normalizer/ConfigEntityNormalizer.php
index 5d97676..7257d6f 100644
--- a/src/Normalizer/ConfigEntityNormalizer.php
+++ b/src/Normalizer/ConfigEntityNormalizer.php
@@ -44,18 +44,14 @@ class ConfigEntityNormalizer extends EntityNormalizer {
    * {@inheritdoc}
    */
   protected function serializeField($field, array $context, $format) {
-    $output = $this->serializer->normalize($field, $format, $context);
-    if (is_array($output)) {
-      $output = new FieldNormalizerValue(
-        [new FieldItemNormalizerValue($output)],
-        1
-      );
-      $output->setPropertyType('attributes');
-      return $output;
+    if (!is_array($field)) {
+      $field = [$field];
     }
-    $field instanceof Relationship ?
-      $output->setPropertyType('relationships') :
-      $output->setPropertyType('attributes');
+    $output = new FieldNormalizerValue(
+      [new FieldItemNormalizerValue($field)],
+      1
+    );
+    $output->setPropertyType('attributes');
     return $output;
   }
 
diff --git a/src/Normalizer/ScalarNormalizer.php b/src/Normalizer/ScalarNormalizer.php
deleted file mode 100644
index e34750a..0000000
--- a/src/Normalizer/ScalarNormalizer.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace Drupal\jsonapi\Normalizer;
-
-use Drupal\jsonapi\Normalizer\Value\FieldItemNormalizerValue;
-use Drupal\jsonapi\Normalizer\Value\FieldNormalizerValue;
-use Symfony\Component\Serializer\Exception\UnexpectedValueException;
-
-/**
- * The normalizer used for scalar inputs.
- */
-class ScalarNormalizer extends NormalizerBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $formats = ['api_json'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function supportsNormalization($data, $format = NULL) {
-    return (!$data || is_scalar($data)) && in_array($format, $this->formats);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function normalize($object, $format = NULL, array $context = []) {
-    $value = new FieldItemNormalizerValue(['value' => $object]);
-    return new FieldNormalizerValue([$value], 1);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function denormalize($data, $class, $format = NULL, array $context = []) {
-    throw new UnexpectedValueException('Denormalization not implemented for JSON API');
-  }
-
-}
diff --git a/tests/src/Kernel/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php b/tests/src/Kernel/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php
index 6d1afc9..4f494cf 100644
--- a/tests/src/Kernel/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php
+++ b/tests/src/Kernel/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php
@@ -264,7 +264,7 @@ class JsonApiDocumentTopLevelNormalizerTest extends JsonapiKernelTestBase {
     // Make sure that the cache tags for the includes and the requested entities
     // are bubbling as expected.
     $this->assertSame(
-      ['file:1', 'node:1', 'taxonomy_term:1', 'taxonomy_term:2'],
+      ['file:1', 'node:1', 'taxonomy_term:1', 'taxonomy_term:2', 'user:1'],
       $response->getCacheableMetadata()->getCacheTags()
     );
     $this->assertSame(
@@ -362,7 +362,7 @@ class JsonApiDocumentTopLevelNormalizerTest extends JsonapiKernelTestBase {
     // Make sure that the cache tags for the includes and the requested entities
     // are bubbling as expected.
     $this->assertSame(
-      ['node:1', 'taxonomy_term:1', 'taxonomy_term:2'],
+      ['node:1', 'taxonomy_term:1', 'taxonomy_term:2', 'user:1'],
       $response->getCacheableMetadata()->getCacheTags()
     );
   }
diff --git a/tests/src/Unit/Normalizer/ConfigEntityNormalizerTest.php b/tests/src/Unit/Normalizer/ConfigEntityNormalizerTest.php
index 732dca0..bcbf144 100644
--- a/tests/src/Unit/Normalizer/ConfigEntityNormalizerTest.php
+++ b/tests/src/Unit/Normalizer/ConfigEntityNormalizerTest.php
@@ -8,7 +8,6 @@ use Drupal\jsonapi\ResourceType\ResourceType;
 use Drupal\jsonapi\ResourceType\ResourceTypeRepository;
 use Drupal\jsonapi\Normalizer\ConfigEntityNormalizer;
 use Drupal\jsonapi\LinkManager\LinkManager;
-use Drupal\jsonapi\Normalizer\ScalarNormalizer;
 use Drupal\Tests\UnitTestCase;
 use Prophecy\Argument;
 use Symfony\Component\Serializer\Serializer;
@@ -42,8 +41,7 @@ class ConfigEntityNormalizerTest extends UnitTestCase {
       $this->prophesize(EntityTypeManagerInterface::class)->reveal()
     );
 
-    $normalizers = [new ScalarNormalizer()];
-    $serializer = new Serializer($normalizers, []);
+    $serializer = new Serializer([], []);
     $this->normalizer->setSerializer($serializer);
   }