Respect the chosen output selection.

Respect the chosen output selection. Refs #638, fixes #601.