Revert "Fixed hangs on file select"

This reverts commit 6e8e5e04c39dc97b5a26eda1aa0b648d218d83bf.