rollback changes from release preparation of 8.0.0