Fix automatic switch for carriers based on variant.