Revert "One last instance from the removed class removed"

This reverts commit f428920352754fd6a62d91b597ba995343ecaac3.