Scheme step form not skipped with single file scheme

Looks like the same problem exists in the 7.x-2.x branch. file_entity_add_upload_step_scheme() uses array_flip:

  // Remove any schemes not found in the instance settings.
  if (!empty($options['schemes'])) {
    $schemes = array_intersect_key($schemes, array_flip($options['schemes']));
  }

Where as file_entity_add_upload_submit doesn't:

  // Remove any schemes not found in the instance settings.
  if (!empty($options['schemes'])) {
    $schemes = array_intersect_key($schemes, $options['schemes']);
  }

The code paths are the same, using the same options from $form['#options']. This always leads to empty schemes, so it will never == 1. When the actual scheme step is displayed it is fine, as that is fixed per the first code snippet above.

Oh, I think I see what was happening. file_entity alone was fine as file_entity_add_upload() has no options on the file upload page. With media module, however, file_entity_add_upload() is used on the media browser. I think that is where the wrong options were passed. With the latest media module this work fine though.