Move import of fs-based data to the upload method.

This is good because it's now protected by a lock and defers the cost
of import to the potentially backgrounded thread that handles upload.