Fix files when not using Amazon S3 for storage

[Taeir]

This fix could also be placed in UploadsHelper#upload_remote_url, but since that one specifically references a remote url (which this may not be), I thought it made more sense here.

Let me know if you want it in a different spot (or method) and I can move it.

Fixes #827