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