changes after understanding of HADOOP-9269.