Revert "Call functions properly."

This reverts commit 0e7711670411b090012d0c35c9db9cf05176ef86

Change-Id: I73f9aabf947221dc1b2cb2a182e5c54e435c06ac
Merge "Revert "Call functions properly."" into production