use vanilla s2 repo again