revert function stubs feature
really revert function stubs
Redo function stubs in commit off master