#2883: Removed backwardscompatibility and changed the level of the decision if surrogate or not into the algorithm (so one level up)