Reverting all commit booboos made on HADOOP-8290. Resetting to state before that. Sorry for so much noise. (harsh)