Merge pull request #3119 from srdo/revert-STORM-3476

Revert "STORM-3476 don't query remote files on cleanup if target size…