Revisit fix for #2062 for consistency with this commit.
Attach a file by drag & drop or click to upload