HDFS-2856: remove unneeded Supplier stuff.