Revert Merging as no interpolation anymore

The enhanced interpolation with 10 points does not interpolate anymore.
With this commit, i would like to recvert the merging of these branches
until the error is fixed.