This reverts commit ba4237c3. Claude asked that these fixes not be backported as they affect translations.