HDFS-13287 broke the build; reverted

[Wei-Chiu Chuang]

Sorry for the cross-post.

If you find your build breaks, it's on me. I committed HDFS-13287 which
resulted in compilation error in trunk/branch-3.2/branch-3.1. The commit
has since been reverted.

Thanks Akira for identifying the issue!