modify for HADOOP-9817