Revert "Allow explicit super_class, support inner classes"
Revert "Allow explicit super_class, support inner classes"

This reverts commit 1d823788d5201b6a3fb5a3151e13988251a566d0.

mkorpela/overrides,mkorpela/overrides