This reverts commit 161f945e. This patch caused a number of regressions. Fixes #3497
Attach a file by drag & drop or click to upload