diff --git a/java/google/registry/module/backend/BackendRequestComponent.java b/java/google/registry/module/backend/BackendRequestComponent.java
index 6e733cf51..7677596eb 100644
--- a/java/google/registry/module/backend/BackendRequestComponent.java
+++ b/java/google/registry/module/backend/BackendRequestComponent.java
@@ -136,7 +136,7 @@ interface BackendRequestComponent {
   VerifyEntityIntegrityAction verifyEntityIntegrityAction();
 
   @Subcomponent.Builder
-  abstract class Builder implements RequestComponentBuilder<BackendRequestComponent, Builder> {
+  abstract class Builder implements RequestComponentBuilder<BackendRequestComponent> {
     @Override public abstract Builder requestModule(RequestModule requestModule);
     @Override public abstract BackendRequestComponent build();
   }
diff --git a/java/google/registry/module/backend/BackendRequestHandler.java b/java/google/registry/module/backend/BackendRequestHandler.java
index b4faf38b4..c2881c1ad 100644
--- a/java/google/registry/module/backend/BackendRequestHandler.java
+++ b/java/google/registry/module/backend/BackendRequestHandler.java
@@ -22,8 +22,7 @@ import javax.inject.Inject;
 import javax.inject.Provider;
 
 /** Request handler for the backend module. */
-public class BackendRequestHandler
-    extends RequestHandler<BackendRequestComponent, BackendRequestComponent.Builder> {
+public class BackendRequestHandler extends RequestHandler<BackendRequestComponent> {
 
   @Inject BackendRequestHandler(
       Provider<BackendRequestComponent.Builder> componentBuilderProvider,
diff --git a/java/google/registry/module/frontend/FrontendRequestComponent.java b/java/google/registry/module/frontend/FrontendRequestComponent.java
index d88cd4ca7..db02d5862 100644
--- a/java/google/registry/module/frontend/FrontendRequestComponent.java
+++ b/java/google/registry/module/frontend/FrontendRequestComponent.java
@@ -81,7 +81,7 @@ interface FrontendRequestComponent {
   WhoisServer whoisServer();
 
   @Subcomponent.Builder
-  abstract class Builder implements RequestComponentBuilder<FrontendRequestComponent, Builder> {
+  abstract class Builder implements RequestComponentBuilder<FrontendRequestComponent> {
     @Override public abstract Builder requestModule(RequestModule requestModule);
     @Override public abstract FrontendRequestComponent build();
   }
diff --git a/java/google/registry/module/frontend/FrontendRequestHandler.java b/java/google/registry/module/frontend/FrontendRequestHandler.java
index edcb07ccd..3063d2f98 100644
--- a/java/google/registry/module/frontend/FrontendRequestHandler.java
+++ b/java/google/registry/module/frontend/FrontendRequestHandler.java
@@ -22,8 +22,7 @@ import javax.inject.Inject;
 import javax.inject.Provider;
 
 /** Request handler for the frontend module. */
-public class FrontendRequestHandler
-    extends RequestHandler<FrontendRequestComponent, FrontendRequestComponent.Builder> {
+public class FrontendRequestHandler extends RequestHandler<FrontendRequestComponent> {
 
   @Inject FrontendRequestHandler(
       Provider<FrontendRequestComponent.Builder> componentBuilderProvider,
diff --git a/java/google/registry/module/tools/ToolsRequestComponent.java b/java/google/registry/module/tools/ToolsRequestComponent.java
index ac438428a..cf0eb2db9 100644
--- a/java/google/registry/module/tools/ToolsRequestComponent.java
+++ b/java/google/registry/module/tools/ToolsRequestComponent.java
@@ -81,7 +81,7 @@ interface ToolsRequestComponent {
   VerifyOteAction verifyOteAction();
 
   @Subcomponent.Builder
-  abstract class Builder implements RequestComponentBuilder<ToolsRequestComponent, Builder> {
+  abstract class Builder implements RequestComponentBuilder<ToolsRequestComponent> {
     @Override public abstract Builder requestModule(RequestModule requestModule);
     @Override public abstract ToolsRequestComponent build();
   }
diff --git a/java/google/registry/module/tools/ToolsRequestHandler.java b/java/google/registry/module/tools/ToolsRequestHandler.java
index d21a4c402..eee4e8538 100644
--- a/java/google/registry/module/tools/ToolsRequestHandler.java
+++ b/java/google/registry/module/tools/ToolsRequestHandler.java
@@ -22,8 +22,7 @@ import javax.inject.Inject;
 import javax.inject.Provider;
 
 /** Request handler for the tools module. */
-public class ToolsRequestHandler
-    extends RequestHandler<ToolsRequestComponent, ToolsRequestComponent.Builder> {
+public class ToolsRequestHandler extends RequestHandler<ToolsRequestComponent> {
 
   @Inject ToolsRequestHandler(
       Provider<ToolsRequestComponent.Builder> componentBuilderProvider,
diff --git a/java/google/registry/request/RequestComponentBuilder.java b/java/google/registry/request/RequestComponentBuilder.java
index 83ae2a21c..bcfacfa9b 100644
--- a/java/google/registry/request/RequestComponentBuilder.java
+++ b/java/google/registry/request/RequestComponentBuilder.java
@@ -19,7 +19,7 @@ package google.registry.request;
  *
  * @see RequestHandler
  */
-public interface RequestComponentBuilder<C, B extends RequestComponentBuilder<C, B>> {
-  B requestModule(RequestModule requestModule);
+public interface RequestComponentBuilder<C> {
+  RequestComponentBuilder<C> requestModule(RequestModule requestModule);
   C build();
 }
diff --git a/java/google/registry/request/RequestHandler.java b/java/google/registry/request/RequestHandler.java
index 336c7c991..df3576cdb 100644
--- a/java/google/registry/request/RequestHandler.java
+++ b/java/google/registry/request/RequestHandler.java
@@ -67,14 +67,13 @@ import javax.servlet.http.HttpServletResponse;
  * <p>This class also enforces the {@link Action#requireLogin() requireLogin} setting.
  *
  * @param <C> request component type
- * @param <B> builder for the request component
  */
-public class RequestHandler<C, B extends RequestComponentBuilder<C, B>> {
+public class RequestHandler<C> {
 
   private static final FormattingLogger logger = FormattingLogger.getLoggerForCallerClass();
 
   private final Router router;
-  private final Provider<B> requestComponentBuilderProvider;
+  private final Provider<? extends RequestComponentBuilder<C>> requestComponentBuilderProvider;
   private final UserService userService;
   private final RequestAuthenticator requestAuthenticator;
   private final XsrfTokenManager xsrfTokenManager;
@@ -94,7 +93,7 @@ public class RequestHandler<C, B extends RequestComponentBuilder<C, B>> {
    * @param xsrfTokenManager an instance of the {@link XsrfTokenManager} class
    */
   protected RequestHandler(
-      Provider<B> requestComponentBuilderProvider,
+      Provider<? extends RequestComponentBuilder<C>> requestComponentBuilderProvider,
       UserService userService,
       RequestAuthenticator requestAuthenticator,
       XsrfTokenManager xsrfTokenManager) {
@@ -103,9 +102,9 @@ public class RequestHandler<C, B extends RequestComponentBuilder<C, B>> {
   }
 
   /** Creates a new RequestHandler with an explicit component class for test purposes. */
-  public static <C, B extends RequestComponentBuilder<C, B>> RequestHandler<C, B> createForTest(
+  public static <C> RequestHandler<C> createForTest(
       Class<C> component,
-      Provider<B> requestComponentBuilderProvider,
+      Provider<? extends RequestComponentBuilder<C>> requestComponentBuilderProvider,
       UserService userService,
       RequestAuthenticator requestAuthenticator,
       XsrfTokenManager xsrfTokenManager) {
@@ -119,7 +118,7 @@ public class RequestHandler<C, B extends RequestComponentBuilder<C, B>> {
 
   private RequestHandler(
       @Nullable Class<C> component,
-      Provider<B> requestComponentBuilderProvider,
+      Provider<? extends RequestComponentBuilder<C>> requestComponentBuilderProvider,
       UserService userService,
       RequestAuthenticator requestAuthenticator,
       XsrfTokenManager xsrfTokenManager) {
diff --git a/javatests/google/registry/request/RequestHandlerTest.java b/javatests/google/registry/request/RequestHandlerTest.java
index da2125588..3bb49ac20 100644
--- a/javatests/google/registry/request/RequestHandlerTest.java
+++ b/javatests/google/registry/request/RequestHandlerTest.java
@@ -194,7 +194,7 @@ public final class RequestHandlerTest {
   }
 
   /** Fake Builder for the fake component above to satisfy RequestHandler expectations. */
-  public abstract class Builder implements RequestComponentBuilder<Component, Builder> {
+  public abstract class Builder implements RequestComponentBuilder<Component> {
     @Override
     public Builder requestModule(RequestModule requestModule) {
       component.setRequestModule(requestModule);
@@ -222,7 +222,7 @@ public final class RequestHandlerTest {
 
   private final Component component = new Component();
   private final StringWriter httpOutput = new StringWriter();
-  private RequestHandler<Component, Builder> handler;
+  private RequestHandler<Component> handler;
   private AuthResult providedAuthResult = null;
   private final User testUser = new User("test@example.com", "test@example.com");
   private RequestAuthenticator requestAuthenticator;
@@ -244,7 +244,7 @@ public final class RequestHandlerTest {
         new LegacyAuthenticationMechanism(userService));
 
     // Initialize here, not inline, so that we pick up the mocked UserService.
-    handler = RequestHandler.<Component, Builder>createForTest(
+    handler = RequestHandler.<Component>createForTest(
         Component.class,
         Providers.<Builder>of(new Builder() {
           @Override