This commit fixes multiple regressions introduced in 2b0891bb.
Attach a file by drag & drop or click to upload
