Draft: Simplify file uploading logic

Logic for file uploading is really complex. Without simplyfing it, fixing isses with file uploads is next to impossible.

Fixes #941, #1930 (closed), !2009 (comment 38601)