modify for HADOOP-9772