Revert "DefinningClasses"

This reverts commit fc0f4fee1f3afcb675d71e1c33d810a2829eac18.