rollback changes from release preparation of sa-1