HDFS-6934. Revert files accidentally committed.