1 files changed, 1 insertions, 18 deletions
diff --git a/container-core/src/main/java/com/yahoo/language/provider/DefaultEncoderProvider.java b/container-core/src/main/java/com/yahoo/language/provider/DefaultEncoderProvider.java
index 9b07ee55bd8..f8550d04d1c 100644
--- a/container-core/src/main/java/com/yahoo/language/provider/DefaultEncoderProvider.java
+++ b/container-core/src/main/java/com/yahoo/language/provider/DefaultEncoderProvider.java
@@ -19,30 +19,13 @@ import java.util.List;
 @SuppressWarnings("unused") // Injected
 public class DefaultEncoderProvider implements Provider<Encoder> {
 
-    // Use lazy initialization to avoid expensive (memory-wise) instantiation
-    private static final Encoder failingEncoder = new FailingEncoder();
-
     @Inject
     public DefaultEncoderProvider() { }
 
     @Override
-    public Encoder get() { return failingEncoder; }
+    public Encoder get() { return Encoder.throwsOnUse; }
 
     @Override
     public void deconstruct() {}
 
-    public static class FailingEncoder implements Encoder {
-
-        @Override
-        public List<Integer> encode(String text, Language language) {
-            throw new IllegalStateException("No encoder has been configured");
-        }
-
-        @Override
-        public Tensor encode(String text, Language language, TensorType tensorType) {
-            throw new IllegalStateException("No encoder has been configured");
-        }
-
-    }
-
 }