modify for HADOOP-9238