Revert "quick fix for undefined function issues from 7a0c074b766b0afdd87cb463a7119512aa5cf88d"

This reverts commit 2410ad17df43a7c45ad0dde1bc698276da887401.