Revert "Changed to correct handling for language"