Another class that we may as well get rid of rather than continuing to support, but that's orthogonal to this PR.