HBASE-12223 Revert from 1.0 branch