diff --git a/router/java/src/net/i2p/router/peermanager/PeerManager.java b/router/java/src/net/i2p/router/peermanager/PeerManager.java
index 1bf119be56f2b3eb1ee2fa2eda07fa1d5d19d30c..c4f47b072493602caba546b35b355c5df49ec15b 100644
--- a/router/java/src/net/i2p/router/peermanager/PeerManager.java
+++ b/router/java/src/net/i2p/router/peermanager/PeerManager.java
@@ -91,10 +91,11 @@ class PeerManager {
                 case PeerSelectionCriteria.PURPOSE_TUNNEL:
                     // pull all of the fast ones, regardless of how many we 
                     // want - we'll whittle them down later (40 lines from now)
-                    int num = _organizer.countFastPeers();
-                    if (num <= 0) 
-                        num = criteria.getMaximumRequired();
-                    _organizer.selectFastPeers(num, exclude, curVals);
+                    // int num = _organizer.countFastPeers();
+                    // if (num <= 0) 
+                    //    num = criteria.getMaximumRequired();
+                    // _organizer.selectFastPeers(num, exclude, curVals);
+                    _organizer.selectFastPeers(criteria.getMaximumRequired(), exclude, curVals);
                     break;
                 case PeerSelectionCriteria.PURPOSE_SOURCE_ROUTE:
                     _organizer.selectHighCapacityPeers(criteria.getMinimumRequired(), exclude, curVals);
@@ -133,6 +134,7 @@ class PeerManager {
         if (_log.shouldLog(Log.INFO))
             _log.info("Peers selected after " + numPasses + ": " + rv);
         
+        /*
         if (criteria.getPurpose() == PeerSelectionCriteria.PURPOSE_TUNNEL) {
             // we selected extra peers above.  now lets strip that down to the 
             // minimum requested, ordering it by the least recently agreed to
@@ -155,6 +157,7 @@ class PeerManager {
             if (_log.shouldLog(Log.INFO))
                 _log.info("Peers selected after " + numPasses + ", sorted for a tunnel: " + rv);
         }
+         */
         return rv;
     }
     
diff --git a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java
index c33f718497d51c55dabd49b7ab0f704e6f3c5f78..6736d31987ffe6611e29ae621095355c0c5f8831 100644
--- a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java
+++ b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java
@@ -600,7 +600,8 @@ public class ProfileOrganizer {
             }
         } else {
             // our average isn't doing well (its recovering from failures)
-            if (numExceedingBaseline > minHighCapacityPeers) {
+            _thresholdCapacityValue = baseline + 0.0000001;
+            /*if (numExceedingBaseline > minHighCapacityPeers) {
                 if (_log.shouldLog(Log.INFO))
                     _log.info("Our average capacity isn't doing well [" + meanCapacity 
                               + "], but the baseline has " + numExceedingBaseline);
@@ -612,6 +613,7 @@ public class ProfileOrganizer {
                               + " so falling back on the median of " + thresholdAtMedian);
                 _thresholdCapacityValue = thresholdAtMedian;
             }
+             */
         }
     }