HDFS-6934. Revert files accidentally committed.

(cherry picked from commit 5b1dfe78b8b06335bed0bcb83f12bb936d4c021b)