Get recover test working again
(closes #3436)
Merge pull request #3438 from aeslaughter/recover-3436

Temporary fixes for recover
Merge commit 'f3352f768c9fdf2868b15006b196d32b2465947a'