rollback changes from release preparation of new-4.4.0