HBASE-11201 Revert due to unit test failures