Revert "gssd: Fix build for now"

This did not fix the build either.
I'll revert both commits for now and
wait for cy@ to do his commit.

This reverts commit 784069e172c53cd5a5e27cda57fe2df01f53ab58.