diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java
@@ -138,8 +138,7 @@
     /** Does the target JDK contain StringConcatFactory class?
      */
     public boolean hasStringConcatFactory() {
-        return false;
-        // return compareTo(JDK1_9) >= 0; TODO: Indy, enable this
+        return compareTo(JDK1_9) >= 0;
     }
 
 }