HBASE-12559 Revert for addressing review comments