This reverts commit f1a81618fdd6318df5edded64fbb07e085e10853. Conflicts: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Segment.java patch reverted changes that happened in parallel without explanation. see jira.