This reverts commit 6b68967d (#2891) and fixes #2979.
Attach a file by drag & drop or click to upload
