Revert "try moving gfunc"

This reverts commit 530cf16de4c306f818b925e9dc929aea472aa346.