rollback changes from release preparation of p2