Revert HDFS-6940.