Restore the fix from the commit 99cd5a96 that was lost in a merge.
Attach a file by drag & drop or click to upload
