Revert HBASE-8453, HBASE-8454.


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