As I wrote, this is only in here so to not leave the trunk in an inconsistent state. These two methods are introduced and then we can bash our heads to find the best solution FOR THESE TWO methods and not for the large load of other code that was crap and that has come up in the other discussion here and there.