Ensure state dropdown reappears during country selection, as required. Fixes #2605