This partially reverts 65d3b977, but is more correct. Closes #1492
Attach a file by drag & drop or click to upload
