Re-enable parallel selector matching.

The problems that were caused because of Yellow River seem to be fixed.

(See #1319).