This reapplies commit ddcb5001, now that we have no more unexpected success.
Attach a file by drag & drop or click to upload
