HDFS-5409: simplify