diff --git a/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java b/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java
index 8986b978e7..c0d47edf60 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java
@@ -490,7 +490,11 @@ private long handleRequest(BuildMessageState state, long now) {
                         // congestion flags
                         if (fromVersion != null){
                             if (VersionComparator.comp(fromVersion, MIN_VERSION_HONOR_CAPS) >= 0) {
-                                _context.statManager().addRateData("tunnel.dropTunnelFromVersion"+from, 1);
+                                _context.statManager().addRateData("tunnel.dropTunnelFromCongestionCapability"+from, 1);
+                                _context.statManager().addRateData("tunnel.dropTunnelFromCongestionCapability"+fromVersion, 1);
+                                /*
+                                TODO: Determine if it's at all reasonable to do something about routers that are forwarding tunnel
+                                builds to us from other people who are spamming tunnel builds.
                                 long knocks = _context.statManager().getRate("tunnel.dropTunnelFromVersion"+from).getLifetimeEventCount();
                                 if (knocks > 10) {
                                     if (_log.shouldLog(Log.WARN))
@@ -508,7 +512,7 @@ private long handleRequest(BuildMessageState state, long now) {
                                     OutNetMessage outMsg = new OutNetMessage(_context, dsm, _context.clock().now() + TIMEOUT, PRIORITY, fromRI);
                                     _context.outNetMessagePool().add(outMsg);
                                 }
-
+                                */
                             }
                         }
                     }