This reverts commit b29663ee.

I'm reverting this because it broke test compilation for the Hadoop 1.x
profiles.