[579152] Revert no instanceClass handling
4 files changed