Revert "Some modification for not_if, need full path to function correctly"

This reverts commit 6ab00a76aacd8d5eb62f694d92ae8078f529db16.