diff --git a/assets/js/postcode-eu-autofill.js b/assets/js/postcode-eu-autofill.js
index 4d4a913..2ec9cf0 100644
--- a/assets/js/postcode-eu-autofill.js
+++ b/assets/js/postcode-eu-autofill.js
@@ -52,7 +52,7 @@
 
 				// Wrap in timeout to execute after Woocommerce field logic:
 				window.setTimeout(function () {
-					toggleAddressFields(getAddressFields(container), !isSupportedCountry(selectedCountry), true, isSupportedCountry(selectedCountry));
+					toggleAddressFields(getAddressFields(container), !isSupportedCountry(selectedCountry), true);
 				});
 			}).trigger('change.postcode-eu.address-fields');
 		})
@@ -96,7 +96,7 @@
 		}
 	}
 
-	const toggleAddressFields = function (addressFields, state, force, isSupportedCountry)
+	const toggleAddressFields = function (addressFields, state, force)
 	{
 		if (!force)
 		{
@@ -120,33 +120,7 @@
 
 			if (field.length > 0 && field.prop('type') !== 'hidden')
 			{
-				let formRow = field.closest('.form-row');
-				formRow.toggle(state);
-				let input = formRow.find('input[type="text"]');
-				if (input.length === 0)
-				{
-					continue;
-				}
-				if (state && !isSupportedCountry)
-				{
-					let previousValue = input.attr('previous-autocomplete');
-					if (previousValue)
-					{
-						input.attr('autocomplete', previousValue);
-					}
-					else
-					{
-						input.attr('autocomplete', null);
-					}
-				}
-				else
-				{
-					if (!input.attr('previous-autocomplete'))
-					{
-						input.attr('previous-autocomplete', input.attr('autocomplete'));
-					}
-					input.attr('autocomplete', 'off');
-				}
+				field.closest('.form-row').toggle(state);
 			}
 		}
 	}
@@ -573,7 +547,7 @@
 
 				const callback = (result) => {
 					fillAddressFieldsIntl(result);
-					toggleAddressFields(addressFields, true, false, true);
+					toggleAddressFields(addressFields, true);
 					intlField
 						.removeClass('postcodenl-address-autocomplete-loading')
 						.trigger('address-result', result);
@@ -633,7 +607,7 @@
 
 			document.addEventListener('autocomplete-xhrerror', function (e) {
 				console.error('Autocomplete XHR error', e);
-				toggleAddressFields(addressFields, true, false, true);
+				toggleAddressFields(addressFields, true);
 				intlField.removeClass('postcodenl-address-autocomplete-loading')
 				setFieldValidity(
 					intlField,
@@ -754,7 +728,7 @@
 			link = $('<a>', {'class': 'postcode-eu-autofill-intl-bypass-link', text: settings.autofillIntlBypassLinkText});
 
 		link.on('click', function () {
-			toggleAddressFields(getAddressFields(container), true, true, true);
+			toggleAddressFields(getAddressFields(container), true, true);
 			formRow.hide();
 			return false;
 		});