Undo accidental reversal of 052e4b7 ("Merge pull request #2413 from dart-lang/import_folder_status") on master

This reverts commit 052e4b7ff011403c654a32a13f45f34a2db3dbdf, reversing
changes made to 593b2b458dc7d07ddf4c8d31c407301e457d7b4f. (reverted from commit 6532f554bbf1b8d129167fb4beaa965a03b0e0c0)