modify for HADOOP-9238
modify for HADOOP-9238