Revert d1bfae9..6c21187

This rolls back to commit d1bfae9f3c33ee5a82e6cf10dc4828a035f161df.
Revert "Revert d1bfae9..6c21187"

This reverts commit 5ab5a114244b84729bf95ba534e6798831f7bc34.
File Recovery updates for Analysis