Revert code cleanup that caused a few regressions in Language

Yuke to fix and re-enable this cleanup