--- old/src/hotspot/cpu/x86/templateTable_x86.cpp	2018-12-18 11:42:26.751827979 +0100
+++ new/src/hotspot/cpu/x86/templateTable_x86.cpp	2018-12-18 11:42:26.348029984 +0100
@@ -2774,7 +2774,7 @@
     __ narrow(rax);
   }
 
-  __ remove_activation(state, rbcp, true, true, true, /*state == qtos*/ false && ValueTypeReturnedAsFields);
+  __ remove_activation(state, rbcp, true, true, true);
 
   __ jmp(rbcp);
 }