This is an extension of #2268. Catches a few places missed the first time around.
Attach a file by drag & drop or click to upload
