Refine the code.
Revert "Refine the code."

This reverts commit bfaf2e6a35ca13b3f4ef970550ed42d17b3ac473.
Merge branch 'hbase-11339' of https://github.com/JingchengDu/hbase into hbase-11339
Fix the issue.