1 files changed, 4 insertions, 4 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processing.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processing.java
index ceb2f06f1d5..f76894f985c 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processing.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processing.java
@@ -32,7 +32,6 @@ public class Processing {
                 SetLanguage::new,
                 UriHack::new,
                 LiteralBoost::new,
-                IndexTo2FieldSet::new,
                 TagType::new,
                 IndexingInputs::new,
                 OptimizeIlscript::new,
@@ -76,7 +75,7 @@ public class Processing {
                 ImportedFieldsInSummayValidator::new,
                 FastAccessValidator::new,
                 ReservedMacroNames::new,
-                //RankingExpressionTypeValidator::new,
+                RankingExpressionTypeValidator::new,
 
                 // These should be last.
                 IndexingValidation::new,
@@ -95,11 +94,12 @@ public class Processing {
     public static void process(Search search,
                                DeployLogger deployLogger,
                                RankProfileRegistry rankProfileRegistry,
-                               QueryProfiles queryProfiles) {
+                               QueryProfiles queryProfiles,
+                               boolean validate) {
         search.process();
         factories.stream()
                 .map(factory -> factory.create(search, deployLogger, rankProfileRegistry, queryProfiles))
-                .forEach(Processor::process);
+                .forEach(processor -> processor.process(validate));
     }
 
     @FunctionalInterface