Revert "Merge branch 'CheckClass'"

This reverts commit 3d12c6b814bf0cfde43b31bc73645008f30aeefa, reversing
changes made to dc775480dba102b9d8831e5bb6db4bf2e6678c02.