Redo function stubs in commit off master