Agreed, I never understood, why we integrated it that way, was hard enough to fix basic stuff after this was merged ^^.