HBASE-9633  Partial reverse of HBASE-9533

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