This reverts commit 202a9bcd because it caused some test failures.
Attach a file by drag & drop or click to upload
