Rescuing styx's fork of grit because we currently need it