HBASE-10467 Revert from trunk



git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1564640 13f79535-47bb-0310-9956-ffa450edef68