Argh, we need these classes (for now at least)

This reverts commit 2f5ef2aa78e28cfaac8edb1f5d61dfb99a12c7d7.