diff --git a/make/hotspot_version b/make/hotspot_version
index b907695e61e0c8cba745f87df0d7a8721f087497..c250e0f7454504a35a4b8659c0f278bfc0489c42 100644
--- a/make/hotspot_version
+++ b/make/hotspot_version
@@ -35,7 +35,7 @@ HOTSPOT_VM_COPYRIGHT=Copyright 2014
 
 HS_MAJOR_VER=25
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=68
+HS_BUILD_NUMBER=69
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8
diff --git a/src/share/vm/opto/c2_globals.hpp b/src/share/vm/opto/c2_globals.hpp
index 207daabc7b3afc15096362a506f08ce0e2e065c5..b3b2fd234ce9fb08177ef8ac0c34de332497849a 100644
--- a/src/share/vm/opto/c2_globals.hpp
+++ b/src/share/vm/opto/c2_globals.hpp
@@ -445,7 +445,7 @@
   notproduct(bool, PrintEliminateLocks, false,                              \
           "Print out when locks are eliminated")                            \
                                                                             \
-  product(bool, EliminateAutoBox, true,                                     \
+  product(bool, EliminateAutoBox, false,                                    \
           "Control optimizations for autobox elimination")                  \
                                                                             \
   experimental(bool, UseImplicitStableValues, false,                        \