Revert "Change the class selection process"

This reverts commit 05b2d52d3c277042b1e6e5ed0c7d8b94273b553b.