location_api2form() strips "NOT LISTED"

Steps to reproduce

1) Submit address with "NOT LISTED" selected for province.
2) Return to form and look at the options list

Problem

"NOT LISTED" is not the default value.

Expected Behavior

When the user has previously selected "NOT LISTED", this default value should be displayed.

Possible Cause

The function location_api2form() deletes $translated['province'] by not having an else statement for when $location['province'] == 'xx'.

In HEAD:

function location_api2form($location = array()) {
  $translated = array();
  foreach ($location as $key => $value) {
    if ($key == 'province') {
      if (strlen($value) && isset($location['country']) && strlen($location['country']) && $location['province'] != 'xx' && $location['country'] != 'xx') {
        $translated['province'] = $location['country'] .'-'. $value;
      }
    }
    else {
      $translated[$key] = $value;
    }
  }
  return $translated;
}