Revert "Remove stray class"

This reverts commit 9f054db38bde34220f24cc90d892f8e14d72a0a8.