[6510]

I like the functions (that were suppose to do things) calling functions suffering from the same issue.

We're not in kansas anymore.