Issue #2247521 by ryan.armstrong: drupal_map_assoc() should be replaced by array_combine().