Revert "unbroke FGD"

This reverts commit 6b840d716612df8f4f446d96dd943ad519f9edfc.