brown bag: undo breakage caused by renaming file input.
Merge branch 'file-upload' into private