--- a/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java	Wed Jul 09 10:49:32 2014 -0400
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java	Thu Jul 10 13:57:27 2014 -0700
@@ -367,11 +367,9 @@
                     } catch (CompletionFailure e) {
                         sym.flags_field |= PUBLIC;
                         ((ClassType) sym.type).supertype_field = objectType;
-                        Name n = target.boxWithConstructors() ? names.init : names.valueOf;
                         MethodSymbol boxMethod =
-                            new MethodSymbol(PUBLIC | STATIC,
-                                n,
-                                new MethodType(List.of(type), sym.type,
+                            new MethodSymbol(PUBLIC | STATIC, names.valueOf,
+                                             new MethodType(List.of(type), sym.type,
                                     List.<Type>nil(), methodClass),
                                 sym);
                         sym.members().enter(boxMethod);
@@ -528,9 +526,7 @@
         comparableType = enterClass("java.lang.Comparable");
         comparatorType = enterClass("java.util.Comparator");
         arraysType = enterClass("java.util.Arrays");
-        iterableType = target.hasIterable()
-            ? enterClass("java.lang.Iterable")
-            : enterClass("java.util.Collection");
+        iterableType = enterClass("java.lang.Iterable");
         iteratorType = enterClass("java.util.Iterator");
         annotationTargetType = enterClass("java.lang.annotation.Target");
         overrideType = enterClass("java.lang.Override");