rollback changes from release preparation of 7.0.0