Revert "Test further changes to cascadeClasses"

This reverts commit 7f116f4d7abe59dedea59f1cc38940ffc3d51509.