HADOOP-8900. I had mistakenly not credited the patch to the right person. Changing the contributor to Andy Isaacson.