diff --git a/elasticsearch/src/main/java/org/elasticsearch/license/Licensing.java b/elasticsearch/src/main/java/org/elasticsearch/license/Licensing.java
index 42874669db9..06b52255ac7 100644
--- a/elasticsearch/src/main/java/org/elasticsearch/license/Licensing.java
+++ b/elasticsearch/src/main/java/org/elasticsearch/license/Licensing.java
@@ -39,7 +39,7 @@ public class Licensing implements ActionPlugin {
     }
 
     @Override
-    public List<ActionHandler<? extends ActionRequest<?>, ? extends ActionResponse>> getActions() {
+    public List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
         if (isTribeNode) {
             return emptyList();
         }
diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/XPackPlugin.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/XPackPlugin.java
index ceb18915b3a..6db0768abed 100644
--- a/elasticsearch/src/main/java/org/elasticsearch/xpack/XPackPlugin.java
+++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/XPackPlugin.java
@@ -357,8 +357,8 @@ public class XPackPlugin extends Plugin implements ScriptPlugin, ActionPlugin, I
     }
 
     @Override
-    public List<ActionHandler<? extends ActionRequest<?>, ? extends ActionResponse>> getActions() {
-        List<ActionHandler<? extends ActionRequest<?>, ? extends ActionResponse>> actions = new ArrayList<>();
+    public List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
+        List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> actions = new ArrayList<>();
         actions.add(new ActionHandler<>(XPackInfoAction.INSTANCE, TransportXPackInfoAction.class));
         actions.add(new ActionHandler<>(XPackUsageAction.INSTANCE, TransportXPackUsageAction.class));
         actions.addAll(licensing.getActions());
diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackInfoRequest.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackInfoRequest.java
index 408eb460535..74b8cfb60ad 100644
--- a/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackInfoRequest.java
+++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/action/XPackInfoRequest.java
@@ -14,7 +14,7 @@ import java.io.IOException;
 import java.util.EnumSet;
 import java.util.Locale;
 
-public class XPackInfoRequest extends ActionRequest<XPackInfoRequest> {
+public class XPackInfoRequest extends ActionRequest {
 
     public enum Category {
         BUILD, LICENSE, FEATURES;
diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/graph/Graph.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/graph/Graph.java
index 40d8255631d..16ecb107b9e 100644
--- a/elasticsearch/src/main/java/org/elasticsearch/xpack/graph/Graph.java
+++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/graph/Graph.java
@@ -42,7 +42,7 @@ public class Graph extends Plugin implements ActionPlugin {
     }
 
     @Override
-    public List<ActionHandler<? extends ActionRequest<?>, ? extends ActionResponse>> getActions() {
+    public List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
         if (false == enabled) {
             return emptyList();
         }
diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreRequest.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreRequest.java
index 28e84646d5d..ec436182537 100644
--- a/elasticsearch/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreRequest.java
+++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/graph/action/GraphExploreRequest.java
@@ -29,7 +29,7 @@ import java.util.List;
  * Holds the criteria required to guide the exploration of connected terms which
  * can be returned as a graph.
  */
-public class GraphExploreRequest extends ActionRequest<GraphExploreRequest> implements IndicesRequest.Replaceable {
+public class GraphExploreRequest extends ActionRequest implements IndicesRequest.Replaceable {
 
     public static final String NO_HOPS_ERROR_MESSAGE = "Graph explore request must have at least one hop";
     public static final String NO_VERTICES_ERROR_MESSAGE = "Graph explore hop must have at least one VertexRequest";
diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/monitoring/Monitoring.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/monitoring/Monitoring.java
index eae0673538a..ff29cd672ed 100644
--- a/elasticsearch/src/main/java/org/elasticsearch/xpack/monitoring/Monitoring.java
+++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/monitoring/Monitoring.java
@@ -125,7 +125,7 @@ public class Monitoring implements ActionPlugin {
     }
 
     @Override
-    public List<ActionHandler<? extends ActionRequest<?>, ? extends ActionResponse>> getActions() {
+    public List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
         if (false == enabled || tribeNode) {
             return emptyList();
         }
diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkRequest.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkRequest.java
index f7dd467efb2..a37269c0eb9 100644
--- a/elasticsearch/src/main/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkRequest.java
+++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/monitoring/action/MonitoringBulkRequest.java
@@ -34,7 +34,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError;
  * type and id of the final document to be indexed. A {@link MonitoringBulkDoc} can also hold its own index/type/id values but there's no
  * guarantee that these information will be effectively used.
  */
-public class MonitoringBulkRequest extends ActionRequest<MonitoringBulkRequest> {
+public class MonitoringBulkRequest extends ActionRequest {
 
     final List<MonitoringBulkDoc> docs = new ArrayList<>();
 
diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/InternalClient.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/InternalClient.java
index b07e20fc039..4095e65a9a2 100644
--- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/InternalClient.java
+++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/InternalClient.java
@@ -62,7 +62,7 @@ public class InternalClient extends FilterClient {
     }
 
     @Override
-    protected <Request extends ActionRequest<Request>, Response extends ActionResponse, RequestBuilder extends
+    protected <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends
         ActionRequestBuilder<Request, Response, RequestBuilder>> void doExecute(
         Action<Request, Response, RequestBuilder> action, Request request, ActionListener<Response> listener) {
 
diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/Security.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/Security.java
index d76a3a51fa2..925eda87dfc 100644
--- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/Security.java
+++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/Security.java
@@ -469,7 +469,7 @@ public class Security implements ActionPlugin, IngestPlugin, NetworkPlugin {
     }
 
     @Override
-    public List<ActionHandler<? extends ActionRequest<?>, ? extends ActionResponse>> getActions() {
+    public List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
         if (enabled == false) {
             return emptyList();
         }
diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/role/DeleteRoleRequest.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/role/DeleteRoleRequest.java
index 6a7147eaa06..05b8f28fca9 100644
--- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/role/DeleteRoleRequest.java
+++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/role/DeleteRoleRequest.java
@@ -18,7 +18,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError;
 /**
  * A request delete a role from the security index
  */
-public class DeleteRoleRequest extends ActionRequest<DeleteRoleRequest> implements WriteRequest<DeleteRoleRequest> {
+public class DeleteRoleRequest extends ActionRequest implements WriteRequest<DeleteRoleRequest> {
 
     private String name;
     private RefreshPolicy refreshPolicy = RefreshPolicy.IMMEDIATE;
diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/role/GetRolesRequest.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/role/GetRolesRequest.java
index 250fa73cde6..cb9223d31b7 100644
--- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/role/GetRolesRequest.java
+++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/role/GetRolesRequest.java
@@ -18,7 +18,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError;
 /**
  * Request to retrieve roles from the security index
  */
-public class GetRolesRequest extends ActionRequest<GetRolesRequest> {
+public class GetRolesRequest extends ActionRequest {
 
     private String[] names = Strings.EMPTY_ARRAY;
 
diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/role/PutRoleRequest.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/role/PutRoleRequest.java
index d5fa633d2ad..6eac954d190 100644
--- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/role/PutRoleRequest.java
+++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/role/PutRoleRequest.java
@@ -28,7 +28,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError;
 /**
  * Request object for adding a role to the security index
  */
-public class PutRoleRequest extends ActionRequest<PutRoleRequest> implements WriteRequest<PutRoleRequest> {
+public class PutRoleRequest extends ActionRequest implements WriteRequest<PutRoleRequest> {
 
     private String name;
     private String[] clusterPrivileges = Strings.EMPTY_ARRAY;
diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateRequest.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateRequest.java
index 1589c843298..ea92201b244 100644
--- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateRequest.java
+++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/AuthenticateRequest.java
@@ -15,7 +15,7 @@ import java.io.IOException;
 
 import static org.elasticsearch.action.ValidateActions.addValidationError;
 
-public class AuthenticateRequest extends ActionRequest<AuthenticateRequest> implements UserRequest {
+public class AuthenticateRequest extends ActionRequest implements UserRequest {
 
     private String username;
 
diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/ChangePasswordRequest.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/ChangePasswordRequest.java
index 8ad5cf72ff6..289f3fe8a1d 100644
--- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/ChangePasswordRequest.java
+++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/ChangePasswordRequest.java
@@ -22,7 +22,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError;
 /**
  * Request to change a user's password.
  */
-public class ChangePasswordRequest extends ActionRequest<ChangePasswordRequest>
+public class ChangePasswordRequest extends ActionRequest
         implements UserRequest, WriteRequest<ChangePasswordRequest> {
 
     private String username;
diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/DeleteUserRequest.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/DeleteUserRequest.java
index 5ac4e5d946b..42d28606977 100644
--- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/DeleteUserRequest.java
+++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/DeleteUserRequest.java
@@ -18,7 +18,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError;
 /**
  * A request to delete a native user.
  */
-public class DeleteUserRequest extends ActionRequest<DeleteUserRequest> implements UserRequest, WriteRequest<DeleteUserRequest> {
+public class DeleteUserRequest extends ActionRequest implements UserRequest, WriteRequest<DeleteUserRequest> {
 
     private String username;
     private RefreshPolicy refreshPolicy = RefreshPolicy.IMMEDIATE;
diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/GetUsersRequest.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/GetUsersRequest.java
index 1d2786a5d3c..608c9513a3e 100644
--- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/GetUsersRequest.java
+++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/GetUsersRequest.java
@@ -18,7 +18,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError;
 /**
  * Request to retrieve a native user.
  */
-public class GetUsersRequest extends ActionRequest<GetUsersRequest> implements UserRequest {
+public class GetUsersRequest extends ActionRequest implements UserRequest {
 
     private String[] usernames;
 
diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/PutUserRequest.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/PutUserRequest.java
index 4cf63262fda..441fdd394cb 100644
--- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/PutUserRequest.java
+++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/PutUserRequest.java
@@ -24,7 +24,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError;
 /**
  * Request object to put a native user.
  */
-public class PutUserRequest extends ActionRequest<PutUserRequest> implements UserRequest, WriteRequest<PutUserRequest> {
+public class PutUserRequest extends ActionRequest implements UserRequest, WriteRequest<PutUserRequest> {
 
     private String username;
     private String[] roles;
diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/SetEnabledRequest.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/SetEnabledRequest.java
index 195fcd37c22..266508df76f 100644
--- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/SetEnabledRequest.java
+++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/action/user/SetEnabledRequest.java
@@ -21,7 +21,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError;
 /**
  * The request that allows to set a user as enabled or disabled
  */
-public class SetEnabledRequest extends ActionRequest<SetEnabledRequest> implements UserRequest, WriteRequest<SetEnabledRequest> {
+public class SetEnabledRequest extends ActionRequest implements UserRequest, WriteRequest<SetEnabledRequest> {
 
     private Boolean enabled;
     private String username;
diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/SecurityIndexSearcherWrapper.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/SecurityIndexSearcherWrapper.java
index 216cc7e6fc9..4357faaaddb 100644
--- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/SecurityIndexSearcherWrapper.java
+++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/SecurityIndexSearcherWrapper.java
@@ -395,7 +395,7 @@ public class SecurityIndexSearcherWrapper extends IndexSearcherWrapper {
             throws IOException {
         Client client = new FilterClient(original.getClient()) {
             @Override
-            protected <Request extends ActionRequest<Request>, Response extends ActionResponse,
+            protected <Request extends ActionRequest, Response extends ActionResponse,
                     RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>>
             void doExecute(Action<Request, Response, RequestBuilder> action, Request request, ActionListener<Response> listener) {
                 throw new IllegalStateException("role queries are not allowed to execute additional requests");
diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/Watcher.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/Watcher.java
index 902267e79c1..434806efad6 100644
--- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/Watcher.java
+++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/Watcher.java
@@ -395,7 +395,7 @@ public class Watcher implements ActionPlugin, ScriptPlugin {
     }
 
     @Override
-    public List<ActionHandler<? extends ActionRequest<?>, ? extends ActionResponse>> getActions() {
+    public List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
         if (false == enabled) {
             return emptyList();
         }
diff --git a/elasticsearch/src/test/java/org/elasticsearch/action/MockIndicesRequest.java b/elasticsearch/src/test/java/org/elasticsearch/action/MockIndicesRequest.java
index 1efaaf9f62d..567b60c13a5 100644
--- a/elasticsearch/src/test/java/org/elasticsearch/action/MockIndicesRequest.java
+++ b/elasticsearch/src/test/java/org/elasticsearch/action/MockIndicesRequest.java
@@ -7,7 +7,7 @@ package org.elasticsearch.action;
 
 import org.elasticsearch.action.support.IndicesOptions;
 
-public class MockIndicesRequest extends ActionRequest<MockIndicesRequest> implements IndicesRequest {
+public class MockIndicesRequest extends ActionRequest implements IndicesRequest {
 
     private final String[] indices;
     private final IndicesOptions indicesOptions;
diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/InternalClientTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/InternalClientTests.java
index 59470300949..61db55f7c03 100644
--- a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/InternalClientTests.java
+++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/InternalClientTests.java
@@ -43,7 +43,7 @@ public class InternalClientTests extends ESTestCase {
     public void testContextIsPreserved() throws IOException, InterruptedException {
         FilterClient dummy = new FilterClient(Settings.EMPTY, threadPool, null) {
             @Override
-            protected <Request extends ActionRequest<Request>, Response extends ActionResponse, RequestBuilder extends
+            protected <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends
                     ActionRequestBuilder<Request, Response, RequestBuilder>> void doExecute(Action<Request, Response, RequestBuilder>
                                                                                                     action, Request request,
                                                                                             ActionListener<Response> listener) {
@@ -96,7 +96,7 @@ public class InternalClientTests extends ESTestCase {
     public void testContextIsPreservedOnError() throws IOException, InterruptedException {
         FilterClient dummy = new FilterClient(Settings.EMPTY, threadPool, null) {
             @Override
-            protected <Request extends ActionRequest<Request>, Response extends ActionResponse, RequestBuilder extends
+            protected <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends
                     ActionRequestBuilder<Request, Response, RequestBuilder>> void doExecute(Action<Request, Response, RequestBuilder>
                                                                                                     action, Request request,
                                                                                             ActionListener<Response> listener) {
diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/SecurityTemplateServiceTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/SecurityTemplateServiceTests.java
index 0abab7137f8..284cc0fee09 100644
--- a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/SecurityTemplateServiceTests.java
+++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/SecurityTemplateServiceTests.java
@@ -73,7 +73,7 @@ public class SecurityTemplateServiceTests extends ESTestCase {
             }
 
             @Override
-            protected <Request extends ActionRequest<Request>, Response extends ActionResponse, RequestBuilder extends
+            protected <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends
                     ActionRequestBuilder<Request, Response, RequestBuilder>> void doExecute(
                     Action<Request, Response, RequestBuilder> action, Request request
                     , ActionListener<Response> listener) {
diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/audit/index/IndexAuditTrailMutedTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/audit/index/IndexAuditTrailMutedTests.java
index 4557366561c..e0471fdf81d 100644
--- a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/audit/index/IndexAuditTrailMutedTests.java
+++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/audit/index/IndexAuditTrailMutedTests.java
@@ -66,7 +66,7 @@ public class IndexAuditTrailMutedTests extends ESTestCase {
                 super(Settings.EMPTY, null, transportClient, null);
            }
             @Override
-            protected <Request extends ActionRequest<Request>, Response extends ActionResponse, RequestBuilder extends
+            protected <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends
                     ActionRequestBuilder<Request, Response, RequestBuilder>> void doExecute(
                     Action<Request, Response, RequestBuilder> action, Request request, ActionListener<Response> listener) {
                 clientCalled.set(true);