diff --git a/android/bazel_handler.go b/android/bazel_handler.go
index 30371214b..96a81324b 100644
--- a/android/bazel_handler.go
+++ b/android/bazel_handler.go
@@ -474,7 +474,7 @@ def %s(target):
     return id_string + ">>" + %s(target)
 `
 
-	for _, requestType := range cquery.RequestTypes {
+	for requestType, _ := range requestTypeToCqueryIdEntries {
 		labelMapName := requestType.Name() + "_Labels"
 		functionName := requestType.Name() + "_Fn"
 		labelRegistrationMapSection += fmt.Sprintf(mapDeclarationFormatString,
diff --git a/bazel/cquery/request_type.go b/bazel/cquery/request_type.go
index bd1ece177..41908b2b8 100644
--- a/bazel/cquery/request_type.go
+++ b/bazel/cquery/request_type.go
@@ -14,11 +14,6 @@ type GetOutputFilesAndCcObjectFiles_Result struct {
 	CcObjectFiles []string
 }
 
-var RequestTypes []RequestType = []RequestType{
-	GetOutputFiles,
-	GetOutputFilesAndCcObjectFiles,
-}
-
 type RequestType interface {
 	// Name returns a string name for this request type. Such request type names must be unique,
 	// and must only consist of alphanumeric characters.