diff --git a/modules/exploits/multi/http/tomcat_mgr_deploy.rb b/modules/exploits/multi/http/tomcat_mgr_deploy.rb
index fb34bf3d4b..8092f549ad 100644
--- a/modules/exploits/multi/http/tomcat_mgr_deploy.rb
+++ b/modules/exploits/multi/http/tomcat_mgr_deploy.rb
@@ -72,7 +72,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					#
 					[ 'Automatic', { } ],
 
-					[ 'Java',
+					[ 'Java Universal',
 						{
 							'Arch' => ARCH_JAVA,
 							'Platform' => 'java'
@@ -101,16 +101,6 @@ class Metasploit3 < Msf::Exploit::Remote
 							'Arch' => ARCH_X86_64,
 							'Platform' => 'linux'
 						},
-					],
-
-					[ 'Java Universal',
-						{
-							'Arch' => ARCH_JAVA,
-							'Payload' =>
-								{
-									'DisableNops' => true
-								}
-						}
 					]
 				],
 			'DefaultTarget'  => 0,