Don't cross the streams
(closes #3439)
Merge pull request #3635 from aeslaughter/recover-3439

Don't cross the streams
Merge commit 'd8092de48491c298628ae52b409dec4f056d9b61'