This backports the fix from #16611, per discussion with the release manager.
Attach a file by drag & drop or click to upload