This reverts commit 628ceac6. The commit broke out of tree builds
Attach a file by drag & drop or click to upload
