Revert "Added ability to specify use_inherited_class_name for sub-classes"

This reverts commit af1b4045e33fa00c63a75147b34bd25bbed9a0af.