Revert back to MultipleCurves implementation