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