This fixes up ab8f346b (a manual merge) that has abandoned some things from PR #2395.
Attach a file by drag & drop or click to upload
