diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/KillBillApiDefinition.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/KillBillApiDefinition.java
index <HASH>..<HASH> 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/KillBillApiDefinition.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/KillBillApiDefinition.java
@@ -121,10 +121,6 @@ public class KillBillApiDefinition implements ReaderListener {
                                qp.getName().equals(JaxrsResource.QUERY_END_DATE)) {
                         qp.setType("string");
                         qp.setFormat("date");
-                    } else if (qp.getName().equals(JaxrsResource.QUERY_CUSTOM_FIELD) ||
-                               qp.getName().equals(JaxrsResource.QUERY_TAG)) {
-                        // Keep the name singular for the ay se wend info (tag=foo$tag-bar, ...), but make it plural (to be nicer) for auto-generated code List<String> tags
-                        qp.setName(String.format("%ss",qp.getName()));
                     }
                 }
             }
jaxrs: Remove renaming of tag/custom field parameter swagger name as it breaks client codegen