Revert "remove references to deprecated classes"

This reverts commit f8d6328c041d9243571fde3df138532ea9e62d6a.