Revert "Remove stray class"

This reverts commit 01869b805b0cb70f0f1e7c9f1070d5ae6f128aa4.