diff --git a/CHANGES.txt b/CHANGES.txt
index 70dc80aca2e..749a1682443 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1220,8 +1220,6 @@ Release 0.90.0 - Unreleased
                and output side.
    HBASE-3223  Get VersionInfo for Running HBase Process
                (Nicolas Spiegelberg via Stack)
-   HBASE-2375  Make decision to split based on aggregate size of all StoreFiles
-               and revisit related config param
 
 
   NEW FEATURES
diff --git a/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index 0da36ddded7..634c0dc40c4 100644
--- a/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -190,7 +190,7 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server {
      * The RPC server ports can be ephemeral. Create a ZKW instance.
      */
     HServerAddress a = new HServerAddress(getMyAddress(this.conf));
-    int numHandlers = conf.getInt("hbase.regionserver.handler.count", 10);
+    int numHandlers = conf.getInt("hbase.regionserver.handler.count", 25);
     this.rpcServer = HBaseRPC.getServer(this,
       new Class<?>[]{HMasterInterface.class, HMasterRegionInterface.class},
       a.getBindAddress(), a.getPort(),
diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
index 2c711be3285..e73c8efd818 100644
--- a/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
+++ b/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
@@ -324,7 +324,7 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler,
         new Class<?>[]{HRegionInterface.class, HBaseRPCErrorHandler.class,
         OnlineRegions.class},
         address.getBindAddress(),
-      address.getPort(), conf.getInt("hbase.regionserver.handler.count", 10),
+      address.getPort(), conf.getInt("hbase.regionserver.handler.count", 25),
         conf.getInt("hbase.regionserver.metahandler.count", 10),
         false, conf, QOS_THRESHOLD);
     this.server.setErrorHandler(this);
diff --git a/src/main/resources/hbase-default.xml b/src/main/resources/hbase-default.xml
index 94dad6af75e..0889566b2f4 100644
--- a/src/main/resources/hbase-default.xml
+++ b/src/main/resources/hbase-default.xml
@@ -163,10 +163,10 @@
   </property>
   <property>
     <name>hbase.regionserver.handler.count</name>
-    <value>10</value>
+    <value>25</value>
     <description>Count of RPC Server instances spun up on RegionServers
     Same property is used by the Master for count of master handlers.
-    Default is 10.
+    Default is 25.
     </description>
   </property>
   <property>