This simplifies the logic for the fix in the next commit.
Attach a file by drag & drop or click to upload
