Essentially reapply c7bd6865 which was lost in b1f59bc6.
Attach a file by drag & drop or click to upload
