Working against mllib fork based on SPARK-2372