Deprecated class and annotation change

No match.