HDFS-5614: This is a big mess, but it is a step forward.