Roll back changes to SparkBuild