Mark for removal where not marked, and set to 7.0 consistently as the target for removal. See gh-33440