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

I should be committed.