--- old/src/hotspot/cpu/x86/globals_x86.hpp	2018-02-15 15:32:20.000000000 -0500
+++ new/src/hotspot/cpu/x86/globals_x86.hpp	2018-02-15 15:32:20.000000000 -0500
@@ -103,8 +103,8 @@
 define_pd_global(bool, ThreadLocalHandshakes, false);
 #endif
 
-define_pd_global(bool, ValueTypePassFieldsAsArgs, LP64_ONLY(true) NOT_LP64(false));
-define_pd_global(bool, ValueTypeReturnedAsFields, LP64_ONLY(true) NOT_LP64(false));
+define_pd_global(bool, ValueTypePassFieldsAsArgs, LP64_ONLY(false) NOT_LP64(false));
+define_pd_global(bool, ValueTypeReturnedAsFields, LP64_ONLY(false) NOT_LP64(false));
 
 #define ARCH_FLAGS(develop, \
                    product, \