--- location.module	2009-04-17 12:12:54.000000000 -0700
+++ location.module	2009-05-22 08:56:37.000000000 -0700
@@ -630,19 +630,15 @@ function location_locationapi(&$obj, $op
           );
 
         case 'province':
-          drupal_add_js(drupal_get_path('module', 'location') .'/location_autocomplete.js');
           $country = $a5['country'] ? $a5['country'] : variable_get('location_default_country', 'us');
+          $options = array_merge(array('' => t('Please select'), 'xx' => t('NOT LISTED')), location_get_provinces($country));
           return array(
-            '#type' => 'textfield',
-            '#title' => t('State/Province'),
-            '#autocomplete_path' => 'location/autocomplete/'. $country,
-            '#default_value' => $obj,
-            '#size' => 64,
-            '#maxlength' => 64,
-            '#description' => NULL,
-            // Used by province autocompletion js.
-            '#attributes' => array('class' => 'location_auto_province'),
-            '#required' => ($a4 == 2),
+            '#type'           => 'select',
+            '#title'          => t('State/Province'),
+            '#default_value'  => $obj,
+            '#options'        => $options,
+            '#description'    => NULL,
+            '#required'       => ($a4 == 2),
           );
 
         case 'country':