d08b9e94e3
This reverts commit 44350fdf495f5cf1bb15b1fe6f6e9587d3de0a59. It is related to the rollback of HADOOP-8143. Change-Id: If48e3dd670c920ada702dc36461ff398fe9d35cc