Revert "added gsi code, untested"

This reverts commit 4042952685fb677a5e7eff712cd2eab08a83ad34.