diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
index 4214f34c1fb..93dab3c5e68 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
@@ -753,7 +753,7 @@ public final class HConstants {
   public static final boolean DEFAULT_DISALLOW_WRITES_IN_RECOVERING_CONFIG = false;
 
   public static final String REGION_SERVER_HANDLER_COUNT = "hbase.regionserver.handler.count";
-  public static final int DEFAULT_REGION_SERVER_HANDLER_COUNT = 10;
+  public static final int DEFAULT_REGION_SERVER_HANDLER_COUNT = 30;
 
   public static final String REGION_SERVER_META_HANDLER_COUNT =
       "hbase.regionserver.metahandler.count";
diff --git a/hbase-server/src/test/resources/hbase-site.xml b/hbase-server/src/test/resources/hbase-site.xml
index f04f0e77bc7..69c52060eef 100644
--- a/hbase-server/src/test/resources/hbase-site.xml
+++ b/hbase-server/src/test/resources/hbase-site.xml
@@ -49,10 +49,6 @@
   <property>
     <name>hbase.regionserver.handler.count</name>
     <value>5</value>
-    <description>Count of RPC Server instances spun up on RegionServers
-    Same property is used by the HMaster for count of master handlers.
-    Default is 10.
-    </description>
   </property>
   <property>
     <name>hbase.master.info.port</name>
diff --git a/src/main/docbkx/configuration.xml b/src/main/docbkx/configuration.xml
index 85a67bc6472..6c8d0e93f34 100644
--- a/src/main/docbkx/configuration.xml
+++ b/src/main/docbkx/configuration.xml
@@ -972,11 +972,11 @@ index e70ebc6..96f8c27 100644
           <section xml:id="hbase.regionserver.handler.count"><title><varname>hbase.regionserver.handler.count</varname></title>
           <para>
           This setting defines the number of threads that are kept open to answer
-          incoming requests to user tables. The default of 10 is rather low in order to
-          prevent users from killing their region servers when using large write buffers
-          with a high number of concurrent clients. The rule of thumb is to keep this
+          incoming requests to user tables. The rule of thumb is to keep this
           number low when the payload per request approaches the MB (big puts, scans using
           a large cache) and high when the payload is small (gets, small puts, ICVs, deletes).
+          The total size of the queries in progress is limited  by the setting
+          "ipc.server.max.callqueue.size".
           </para>
           <para>
           It is safe to set that number to the