Use spark-0.9 branch which has the patch we need and remove the
manual application of the patch.