Revert "class (121113)"

This reverts commit b87fc1df667d3c9a5dfb9813a80b198cddf44f74.