cherry pick of will's localization fix