This _partially_ reverts fixes already applied by the patch from bug 521861.
Attach a file by drag & drop or click to upload
