HBASE-9462 Revert due to test failure



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