Revert "Fix Defining classes part 2"

This reverts commit 66495830aec99be0284f34a767f87066340fb1b3.