Undo reindtroduction of deprecated class usage
Upstream API change