Re-add and fix gsskex patch