rollback changes from release preparation of new-3.3.0