rollback changes from release preparation of new-3.2.2