rollback changes from release preparation of rerere