Undo backport of function overloading from trunk
Cleanup