Revert "goal underlig path fix"

This reverts commit 04ce6bd272735046062666e978099b2aa4ff8694.