Revert "Fix broken assumptions in LocalePicker."

This reverts commit 32c3adf3418f232801f5f6b0fd9da456d291da37.