Followup to HADOOP-17379. Contributed by Jungtaek Lim. Change-Id: I7b2fce36028d297c1e095499691a08caba92d9fd