Now works with the new sklearn.