Temporarily revert changes that create separate class descriptors for each PSI class