Yes, then I have reverted those old functions, generic functions are only called in user-land.