upstream changes sent locale auto detection back in development