This reverts commit 4799af09. Upstream provided adequate fix. This commit is no longer necessary.
Attach a file by drag & drop or click to upload
