This reverts commit 627eb30f. Bug: 10183961 Bug: 10186213
Attach a file by drag & drop or click to upload