Return the original classes if we aren't overriding

I should be committed
Merge pull request #20 from washingtonstateuniversity/oops-part-2

[PR] Return the original classes if we aren't overriding