--- a/hotspot/src/cpu/x86/vm/vm_version_x86.cpp	Fri May 12 14:59:35 2017 +0800
+++ b/hotspot/src/cpu/x86/vm/vm_version_x86.cpp	Mon Jun 19 11:23:16 2017 +0000
@@ -641,9 +641,6 @@
     _features &= ~CPU_VZEROUPPER;
   }
 
-  if (!UseAES && !FLAG_IS_DEFAULT(UseAES))
-    _features &= ~CPU_AES;
-
   if (logical_processors_per_package() == 1) {
     // HT processor could be installed on a system which doesn't support HT.
     _features &= ~CPU_HT;