Reverting cfcdd344a226eb362cf0b036a0fd8854e1be0b6f to fix build for Spark using Hadoop 1.0.4.