Reverted to Spark 1.1.1